--- deliantra/server/common/region.C	2006/09/14 22:34:00	1.6
+++ deliantra/server/common/region.C	2006/12/13 02:55:50	1.10
@@ -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.
@@ -62,7 +59,7 @@
 
 /* This might need optimising at some point. */
 region *
-get_region_by_map (mapstruct *m)
+get_region_by_map (maptile *m)
 {
   return get_region_by_name (get_name_of_region_for_map (m));
 }
@@ -74,7 +71,7 @@
  */
 
 const char *
-get_name_of_region_for_map (const mapstruct *m)
+get_name_of_region_for_map (const maptile *m)
 {
   region *reg;
 
@@ -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;
 }
 
 /*