--- deliantra/server/common/region.C 2006/09/13 23:39:27 1.5 +++ deliantra/server/common/region.C 2006/12/12 21:39:56 1.9 @@ -18,15 +18,12 @@ along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - The authors can be reached via e-mail at crossfire-devel@real-time.com + The authors can be reached via e-mail at */ #include - -#ifndef WIN32 /* ---win32 exclude header */ -# include -#endif /* win32 */ +#include /* * 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);