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

Comparing deliantra/server/common/item.C (file contents):
Revision 1.58 by root, Mon Oct 12 14:00:57 2009 UTC vs.
Revision 1.60 by root, Thu Oct 15 20:12:35 2009 UTC

   {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},
  * 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;
 }

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