--- deliantra/server/common/utils.C 2006/09/04 11:07:59 1.4 +++ deliantra/server/common/utils.C 2006/09/08 17:34:02 1.7 @@ -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.7 2006/09/08 17:34:02 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,7 +487,6 @@ return; } -//TODO: overhead due to specifying size twice void * zero_initialised::operator new (size_t s) {