[ViewVC] Diff of: cvs/deliantra/server/common/item.C

Comparing deliantra/server/common/item.C (file contents):
Revision 1.57 by root, Mon Oct 12 04:03:41 2009 UTC vs.
Revision 1.66 by root, Sun Nov 8 20:55:39 2009 UTC

  *
  * Copyright (©) 2005,2006,2007,2008,2009 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
  * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
  * Copyright (©) 1992,2007 Frank Tore Johansen
  *
- * Deliantra is free software: you can redistribute it and/or modify
+ * Deliantra is free software: you can redistribute it and/or modify it under
- * it under the terms of the GNU General Public License as published by
+ * the terms of the Affero GNU General Public License as published by the
- * the Free Software Foundation, either version 3 of the License, or
+ * Free Software Foundation, either version 3 of the License, or (at your
- * (at your option) any later version.
+ * option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
+ * You should have received a copy of the Affero GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * and the GNU General Public License along with this program. If not, see
+ * <http://www.gnu.org/licenses/>.
  *
  * The authors can be reached via e-mail to <support@deliantra.net>
  */
 #include <global.h>
   {KW_body_foot    , "You can put it on your foot"          , "It goes on a human's foot"},
   {KW_body_hand    , "You can put it on your hand"          , "It goes on a human's hand"},
   {KW_body_wrist   , "You can wear it around your wrist"    , "It goes around a human's wrist"},
   {KW_body_waist   , "You can wear it around your waist"    , "It goes around a human's waist"},
 /*{"body_dragon_torso", "your body", "a dragon's body"} */
-};
-static char numbers[21][20] = {
-  "no", "", "two", "three", "four", "five", "six", "seven", "eight", "nine", "ten",
-  "eleven", "twelve", "thirteen", "fourteen", "fifteen", "sixteen", "seventeen",
-  "eighteen", "nineteen", "twenty"
 };
 static char numbers_10[10][20] = {
   "zero", "ten", "twenty", "thirty", "fourty", "fifty", "sixty", "seventy",
   "eighty", "ninety"
   {SPELLBOOK, "spellbook", "spellbooks", SK_LITERACY, 0},
   {CLOAK, "cloak", "cloaks", SK_SMITHERY, 0},
   {SPINNER, "spinner", "spinners", 0, 0},
   {GATE, "gate", "gates", 0, 0},
   {BUTTON, "button", "buttons", 0, 0},
-  {CF_HANDLE, "cf handle", "cf handles", 0, 0},
+  {T_HANDLE, "cf handle", "cf handles", 0, 0},
   {HOLE, "hole", "holes", 0, 0},
   {TRAPDOOR, "trapdoor", "trapdoors", 0, 0},
   {SIGN, "sign", "signs", 0, 0},
   {BOOTS, "boots", "boots", SK_SMITHERY, 0},
   {GLOVES, "gloves", "gloves", SK_SMITHERY, 0},
   {BUILDER, "item builder", "item builders", 0, 0},
   {MATERIAL, "building material", "building materials", 0, 0},
   {ITEM_TRANSFORMER, "item_transformer", "item_transformers", 0, 0},
 };
-const int item_types_size = sizeof (item_types) / sizeof (*item_types);
+static const int item_types_size = sizeof (item_types) / sizeof (*item_types);
 materialtype_t *materialt;
 /*
 materialtype material[NROFMATERIALS] = {
   enc += op->stats.luck;
   /* Do spell paths now */
   for (i = 1; i < NRSPELLPATHS; i++)
-    {
-      if (op->path_attuned & (1 << i))
+    if (op->path_attuned & (1 << i))
-        enc++;
+      enc++;
-      else if (op->path_denied & (1 << i))
+    else if (op->path_denied & (1 << i))
-        enc -= 2;
+      enc -= 2;
-      else if (op->path_repelled & (1 << i))
+    else if (op->path_repelled & (1 << i))
-        enc--;
+      enc--;
-    }
   if (op->flag [FLAG_LIFESAVE    ]) enc += 5;
   if (op->flag [FLAG_REFL_SPELL  ]) enc += 3;
   if (op->flag [FLAG_REFL_MISSILE]) enc += 2;
   if (op->flag [FLAG_XRAYS       ]) enc += 2;
  * but do put a newline at the end.  Useful when dumping to files
  */
 const char *
 describe_resistance (const object *op, int newline)
 {
-  static char buf[VERY_BIG_BUF];
+  static dynbuf_text buf; buf.clear ();
-  char buf1[VERY_BIG_BUF];
-  int tmpvar;
-  buf[0] = 0;
+  for (int i = 0; i < NROFATTACKS; i++)
-  for (tmpvar = 0; tmpvar < NROFATTACKS; tmpvar++)
-    {
-      if (op->resist[tmpvar] && (op->type != FLESH || atnr_is_dragon_enabled (tmpvar) == 1))
+    if (op->resist[i] && (op->type != FLESH || atnr_is_dragon_enabled (i) == 1))
-        {
+      buf.printf (newline ? "%s %d\n" : "(%s %+d)", resist_plus[i], op->resist[i]);
-          if (!newline)
-            sprintf (buf1, "(%s %+d)", resist_plus[tmpvar], op->resist[tmpvar]);
-          else
-            sprintf (buf1, "%s %d\n", resist_plus[tmpvar], op->resist[tmpvar]);
-          strcat (buf, buf1);
-        }
-    }
   return buf;
 }
 /*
  * query_weight(object) returns a character pointer to a static buffer
  * containing the text-representation of the weight of the given object.
  * The buffer will be overwritten by the next call to query_weight().
     return levelnumbers_10[i / 10];
   strcpy (buf, numbers_10[i / 10]);
   strcat (buf, levelnumbers[i % 10]);
   return buf;
-}
-/*
- * get_number(integer) returns the text-representation of the given number
- * in a static buffer.  The buffer might be overwritten at the next
- * call to get_number().
- * It is currently only used by the query_name() function.
- */
-const char *
-get_number (int i)
-{
-  if (i <= 20)
-    return numbers[i];
-  else
-    {
-      static char buf[MAX_BUF];
-      sprintf (buf, "%d", i);
-      return buf;
-    }
 }
 /*
  *  Returns pointer to static buffer containing ring's or amulet's
  *  abilities
  */
 /* Aug 95 modified this slightly so that Skill tools don't have magic bonus
  * from stats.sp - b.t.
  */
-const char *
+static const char *
 ring_desc (const object *op)
 {
   static dynbuf_text buf; buf.clear ();
   int attr, val, len;
   buf << query_short_name (op);
   if (QUERY_FLAG (op, FLAG_INV_LOCKED))
     buf << " *";
-  if (op->type == CONTAINER && ((op->env && op->env->container == op) || (!op->env && QUERY_FLAG (op, FLAG_APPLIED))))
+  if (op->is_open_container ())
     buf << " (open)";
   if (QUERY_FLAG (op, FLAG_KNOWN_CURSED))
     {
       if (QUERY_FLAG (op, FLAG_DAMNED))
   /* Note that the resolution this provides for players really isn't
    * very good.  Any player with a speed greater than .67 will
    * fall into the 'lightning fast movement' category.
    */
   if (op->has_active_speed ())
-    switch ((int) ((FABS (op->speed)) * 15))
+    switch ((int)((fabs (op->speed)) * 15.))
       {
         case 0:
           buf << "(very slow movement)";
           break;
         case 1:

Diff Legend

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines

Comparing deliantra/server/common/item.C (file contents): Revision 1.57 by root, Mon Oct 12 04:03:41 2009 UTC vs. Revision 1.66 by root, Sun Nov 8 20:55:39 2009 UTC

Diff Legend

Comparing deliantra/server/common/item.C (file contents):
Revision 1.57 by root, Mon Oct 12 04:03:41 2009 UTC vs.
Revision 1.66 by root, Sun Nov 8 20:55:39 2009 UTC