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.234 by root, Tue May 6 18:47:52 2008 UTC vs.
Revision 1.235 by root, Tue May 6 20:00:12 2008 UTC

1117 1117
1118 /* Relink the object below us, if there is one */ 1118 /* Relink the object below us, if there is one */
1119 if (below) 1119 if (below)
1120 below->above = above; 1120 below->above = above;
1121 else 1121 else
1122 { 1122 ms.bot = above;
1123 /* Nothing below, which means we need to relink map object for this space
1124 * use translated coordinates in case some oddness with map tiling is
1125 * evident
1126 */
1127 if (GET_MAP_OB (map, x, y) != this)
1128 LOG (llevError, "remove_ob: GET_MAP_OB does not return object to be removed even though it appears to be on the bottom? %s\n", debug_desc ());
1129
1130 ms.bot = above; /* goes on above it. */
1131 }
1132 1123
1133 above = 0; 1124 above = 0;
1134 below = 0; 1125 below = 0;
1135 1126
1136 if (map->in_memory == MAP_SAVING) 1127 if (map->in_memory == MAP_SAVING)

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines