--- deliantra/server/common/utils.C 2006/09/04 11:07:59 1.4 +++ deliantra/server/common/utils.C 2006/09/09 21:48:28 1.8 @@ -1,6 +1,6 @@ /* * 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 $"; */ /* @@ -306,7 +306,9 @@ 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; @@ -485,28 +487,31 @@ 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); }