ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/common/region.C
(Generate patch)

Comparing deliantra/server/common/region.C (file contents):
Revision 1.8 by pippijn, Mon Dec 11 19:46:46 2006 UTC vs.
Revision 1.10 by root, Wed Dec 13 02:55:50 2006 UTC

234 reg = get_region_by_map (op->map); 234 reg = get_region_by_map (op->map);
235 while (reg != NULL) 235 while (reg != NULL)
236 { 236 {
237 if (reg->jailmap) 237 if (reg->jailmap)
238 { 238 {
239 exit = get_object (); 239 exit = object::create ();
240 EXIT_PATH (exit) = reg->jailmap; 240 EXIT_PATH (exit) = reg->jailmap;
241 /* damned exits reset savebed and remove teleports, so the prisoner can't escape */ 241 /* damned exits reset savebed and remove teleports, so the prisoner can't escape */
242 SET_FLAG (exit, FLAG_DAMNED); 242 SET_FLAG (exit, FLAG_DAMNED);
243 EXIT_X (exit) = reg->jailx; 243 EXIT_X (exit) = reg->jailx;
244 EXIT_Y (exit) = reg->jaily; 244 EXIT_Y (exit) = reg->jaily;
288 */ 288 */
289 289
290region * 290region *
291get_region_struct (void) 291get_region_struct (void)
292{ 292{
293
294 region *reg;
295
296 reg = (region *) CALLOC (1, sizeof (region));
297 if (reg == NULL)
298 fatal (OUT_OF_MEMORY);
299
300 memset (reg, '\0', sizeof (region));
301
302 return reg; 293 return new region;
303} 294}
304 295
305/* 296/*
306 * Reads/parses the region file, and copies into a linked list 297 * Reads/parses the region file, and copies into a linked list
307 * of region structs. 298 * of region structs.

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines