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

Comparing deliantra/server/common/utils.C (file contents):
Revision 1.4 by root, Mon Sep 4 11:07:59 2006 UTC vs.
Revision 1.8 by root, Sat Sep 9 21:48:28 2006 UTC

 /*
  * static char *rcsid_utils_c =
- *   "$Id: utils.C,v 1.4 2006/09/04 11:07:59 root Exp $";
+ *   "$Id: utils.C,v 1.8 2006/09/09 21:48:28 root Exp $";
  */
 /*
     CrossFire, A Multiplayer game for X-windows
 /* set the materialname and type for an item */
 void set_materialname(object *op, int difficulty, materialtype_t *nmt)
 {
     materialtype_t *mt, *lmt;
+#ifdef NEW_MATERIAL_CODE
     int j;
+#endif
     if (op->materialname != NULL)
         return;
     }
     else strcpy(input, tmp);
     return;
 }
-//TODO: overhead due to specifying size twice
 void *
 zero_initialised::operator new (size_t s)
 {
+  //return calloc (1, s);
   return g_slice_alloc0 (s);
 }
 void *
 zero_initialised::operator new [] (size_t s)
 {
+  //return calloc (1, s);
   return g_slice_alloc0 (s);
 }
 void
 zero_initialised::operator delete (void *p, size_t s)
 {
+  //free (p); return;
   g_slice_free1 (s, p);
 }
 void
 zero_initialised::operator delete [] (void *p, size_t s)
 {
+  //free (p); return;
   g_slice_free1 (s, p);
 }

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