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.39 by root, Tue May 6 16:55:25 2008 UTC vs.
Revision 1.40 by root, Wed Dec 31 17:35:37 2008 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines