[ViewVC] Diff of: cvs/deliantra/server/common/region.C

Comparing deliantra/server/common/region.C (file contents):
Revision 1.7 by root, Sat Sep 16 22:24:12 2006 UTC vs.
Revision 1.10 by root, Wed Dec 13 02:55:50 2006 UTC

     The authors can be reached via e-mail at <crossfire@schmorp.de>
 */
 #include <global.h>
-#ifndef WIN32                   /* ---win32 exclude header */
-# include <unistd.h>
+#include <unistd.h>
-#endif /* win32 */
 /*
  * Pass a char array, returns a pointer to the region of the same name.
  * if it can't find a region of the same name it returns the first region
  * with the 'fallback' property set.
   reg = get_region_by_map (op->map);
   while (reg != NULL)
     {
       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);
           EXIT_X (exit) = reg->jailx;
           EXIT_Y (exit) = reg->jaily;
  */
 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;
 }
 /*
  * Reads/parses the region file, and copies into a linked list
  * of region structs.

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines