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.40 by root, Wed Dec 31 17:35:37 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
132 * if passed a NULL region returns -1 132 * if passed a NULL region returns -1
133 */ 133 */
134static int 134static int
135region_is_child_of_region (const region * child, const region * r) 135region_is_child_of_region (const region * child, const region * r)
136{ 136{
137 137 if (!r)
138 if (r == NULL)
139 return -1; 138 return -1;
140 139
141 if (child == NULL) 140 if (!child)
142 return 0; 141 return 0;
143 142
144 if (!strcmp (child->name, r->name)) 143 if (child->name == r->name)
145 return 1; 144 return 1;
146 145
147 else if (child->parent != NULL) 146 if (child->parent)
148 return region_is_child_of_region (child->parent, r); 147 return region_is_child_of_region (child->parent, r);
149 else 148
150 return 0; 149 return 0;
151} 150}
152 151
153/** Returns an object which is an exit through which the player represented by op should be 152/** Returns an object which is an exit through which the player represented by op should be
154 * sent in order to be imprisoned. If there is no suitable place to which an exit can be 153 * sent in order to be imprisoned. If there is no suitable place to which an exit can be
155 * constructed, then NULL will be returned. The caller is responsible for freeing the object 154 * constructed, then NULL will be returned. The caller is responsible for freeing the object
156 * created by this function. 155 * created by this function.
157 */ 156 */
158object * 157object *
159get_jail_exit (object *op) 158get_jail_exit (object *op)
160{ 159{
161 region *reg;
162 object *exit;
163
164 if (op->type != PLAYER) 160 if (op->type != PLAYER)
165 { 161 {
166 LOG (llevError, "region.c: get_jail_exit called against non-player object.\n"); 162 LOG (llevError, "region.c: get_jail_exit called against non-player object.\n");
167 return NULL; 163 return NULL;
168 } 164 }
169 165
170 reg = op->region (); 166 region *reg = op->region ();
171 while (reg) 167 while (reg)
172 { 168 {
173 if (reg->jailmap) 169 if (reg->jailmap)
174 { 170 {
175 exit = object::create (); 171 object *exit = object::create ();
176 EXIT_PATH (exit) = reg->jailmap; 172 EXIT_PATH (exit) = reg->jailmap;
177 /* damned exits reset savebed and remove teleports, so the prisoner can't escape */ 173 /* damned exits reset savebed and remove teleports, so the prisoner can't escape */
178 SET_FLAG (exit, FLAG_DAMNED); 174 SET_FLAG (exit, FLAG_DAMNED);
179 EXIT_X (exit) = reg->jailx; 175 EXIT_X (exit) = reg->jailx;
180 EXIT_Y (exit) = reg->jaily; 176 EXIT_Y (exit) = reg->jaily;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines