--- deliantra/server/common/utils.C 2006/08/29 08:01:36 1.2 +++ deliantra/server/common/utils.C 2006/09/03 00:18:40 1.3 @@ -1,6 +1,6 @@ /* * 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 $"; */ /* @@ -286,7 +286,7 @@ 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; } @@ -338,7 +338,7 @@ if (lmt != NULL) { #ifndef NEW_MATERIAL_CODE - op->materialname = add_string(lmt->name); + op->materialname = lmt->name; return; #else @@ -482,3 +482,19 @@ 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); +} +