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

Comparing deliantra/server/common/object.C (file contents):
Revision 1.104 by root, Tue Jan 2 21:13:21 2007 UTC vs.
Revision 1.105 by pippijn, Wed Jan 3 00:21:35 2007 UTC

1204 { 1204 {
1205 /* The part may be on a different map. */ 1205 /* The part may be on a different map. */
1206 1206
1207 object *more = op->more; 1207 object *more = op->more;
1208 1208
1209 /* We really need the caller to normalize coordinates - if 1209 /* We really need the caller to normalise coordinates - if
1210 * we set the map, that doesn't work if the location is within 1210 * we set the map, that doesn't work if the location is within
1211 * a map and this is straddling an edge. So only if coordinate 1211 * a map and this is straddling an edge. So only if coordinate
1212 * is clear wrong do we normalize it. 1212 * is clear wrong do we normalise it.
1213 */ 1213 */
1214 if (OUT_OF_REAL_MAP (more->map, more->x, more->y)) 1214 if (OUT_OF_REAL_MAP (more->map, more->x, more->y))
1215 more->map = get_map_from_coord (m, &more->x, &more->y); 1215 more->map = get_map_from_coord (m, &more->x, &more->y);
1216 else if (!more->map) 1216 else if (!more->map)
1217 { 1217 {

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines