--- deliantra/server/common/region.C	2006/09/16 22:24:12	1.7
+++ deliantra/server/common/region.C	2006/12/14 22:45:40	1.11
@@ -23,10 +23,7 @@
 
 
 #include <global.h>
-
-#ifndef WIN32                   /* ---win32 exclude header */
-# include <unistd.h>
-#endif /* win32 */
+#include <unistd.h>
 
 /* 
  * 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;
 }
 
 /*
@@ -359,7 +347,7 @@
         {
           *end = 0;
           newreg = get_region_struct ();
-          newreg->name = strdup_local (value);
+          newreg->name = strdup (value);
         }
       else if (!strcmp (key, "parent"))
         {
@@ -369,12 +357,12 @@
            * parsed.
            */
           *end = 0;
-          newreg->parent_name = strdup_local (value);
+          newreg->parent_name = strdup (value);
         }
       else if (!strcmp (key, "longname"))
         {
           *end = 0;
-          newreg->longname = strdup_local (value);
+          newreg->longname = strdup (value);
         }
       else if (!strcmp (key, "jail"))
         {
@@ -387,7 +375,7 @@
               LOG (llevError, "region.c: malformated regions entry: jail %s\n", value);
               continue;
             }
-          newreg->jailmap = strdup_local (path);
+          newreg->jailmap = strdup (path);
           newreg->jailx = x;
           newreg->jaily = y;
         }
@@ -409,7 +397,7 @@
            * so better do it here too...
            */
           if (msgpos != 0)
-            newreg->msg = strdup_local (msgbuf);
+            newreg->msg = strdup (msgbuf);
 
           /* we have to reset msgpos, or the next region will store both msg blocks. */
           msgpos = 0;