--- deliantra/server/common/region.C 2006/09/16 22:24:12 1.7 +++ deliantra/server/common/region.C 2006/12/13 02:55:50 1.10 @@ -23,10 +23,7 @@ #include - -#ifndef WIN32 /* ---win32 exclude header */ -# include -#endif /* win32 */ +#include /* * Pass a char array, returns a pointer to the region of the same name. @@ -239,7 +236,7 @@ { if (reg->jailmap) { - exit = get_object (); + exit = object::create (); EXIT_PATH (exit) = reg->jailmap; /* damned exits reset savebed and remove teleports, so the prisoner can't escape */ SET_FLAG (exit, FLAG_DAMNED); @@ -293,16 +290,7 @@ region * get_region_struct (void) { - - region *reg; - - reg = (region *) CALLOC (1, sizeof (region)); - if (reg == NULL) - fatal (OUT_OF_MEMORY); - - memset (reg, '\0', sizeof (region)); - - return reg; + return new region; } /*