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

Comparing deliantra/server/common/utils.C (file contents):
Revision 1.2 by root, Tue Aug 29 08:01:36 2006 UTC vs.
Revision 1.3 by root, Sun Sep 3 00:18:40 2006 UTC

 /*
  * static char *rcsid_utils_c =
- *   "$Id: utils.C,v 1.2 2006/08/29 08:01:36 root Exp $";
+ *   "$Id: utils.C,v 1.3 2006/09/03 00:18:40 root Exp $";
  */
 /*
     CrossFire, A Multiplayer game for X-windows
     if (!IS_ARMOR(op))
         return;
     mt = name_to_material(op->materialname);
     if (!mt) {
-        LOG(llevError, "archetype '%s>%s' uses nonexistent material '%s'\n", op->arch->name, op->name, op->materialname);
+        LOG(llevError, "archetype '%s>%s' uses nonexistent material '%s'\n", &op->arch->name, &op->name, &op->materialname);
         return;
     }
     for (j=0; j < NROFATTACKS; j++)
         if (op->resist[j] == 0 && change->resist[j] != 0) {
         lmt = nmt;
     }
     if (lmt != NULL) {
 #ifndef NEW_MATERIAL_CODE
-        op->materialname = add_string(lmt->name);
+        op->materialname = lmt->name;
         return;
 #else
         if (op->stats.dam && IS_WEAPON(op)) {
             op->stats.dam += lmt->damage;
         strcat(input, p);
     }
     else strcpy(input, tmp);
     return;
 }
+void *
+zero_initialised::operator new (size_t s)
+{
+  void *p = malloc (s);
+  memset (p, 0, s);
+  return p;
+}
+void
+zero_initialised::operator delete (void *p, size_t s)
+{
+  free (p);
+}

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