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.37 by root, Thu Nov 8 19:43:23 2007 UTC vs.
Revision 1.39 by root, Tue May 6 16:55:25 2008 UTC

1/* 1/*
2 * This file is part of Deliantra, the Roguelike Realtime MMORPG. 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4 * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2001-2003,2007 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2001-2003,2007 Mark Wedel & Crossfire Development Team
6 * Copyright (©) 1992,2007 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
7 * 7 *
8 * Deliantra is free software: you can redistribute it and/or modify 8 * Deliantra is free software: you can redistribute it and/or modify
9 * it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
156 * created by this function. 156 * created by this function.
157 */ 157 */
158object * 158object *
159get_jail_exit (object *op) 159get_jail_exit (object *op)
160{ 160{
161 region *reg;
162 object *exit;
163
164 if (op->type != PLAYER) 161 if (op->type != PLAYER)
165 { 162 {
166 LOG (llevError, "region.c: get_jail_exit called against non-player object.\n"); 163 LOG (llevError, "region.c: get_jail_exit called against non-player object.\n");
167 return NULL; 164 return NULL;
168 } 165 }
169 166
170 reg = op->region (); 167 region *reg = op->region ();
171 while (reg) 168 while (reg)
172 { 169 {
173 if (reg->jailmap) 170 if (reg->jailmap)
174 { 171 {
175 exit = object::create (); 172 object *exit = object::create ();
176 EXIT_PATH (exit) = reg->jailmap; 173 EXIT_PATH (exit) = reg->jailmap;
177 /* damned exits reset savebed and remove teleports, so the prisoner can't escape */ 174 /* damned exits reset savebed and remove teleports, so the prisoner can't escape */
178 SET_FLAG (exit, FLAG_DAMNED); 175 SET_FLAG (exit, FLAG_DAMNED);
179 EXIT_X (exit) = reg->jailx; 176 EXIT_X (exit) = reg->jailx;
180 EXIT_Y (exit) = reg->jaily; 177 EXIT_Y (exit) = reg->jaily;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines