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.240 by root, Wed May 7 13:40:30 2008 UTC vs.
Revision 1.241 by root, Wed May 7 19:19:09 2008 UTC

1310 if (!QUERY_FLAG (op, FLAG_ALIVE)) 1310 if (!QUERY_FLAG (op, FLAG_ALIVE))
1311 CLEAR_FLAG (op, FLAG_NO_STEAL); 1311 CLEAR_FLAG (op, FLAG_NO_STEAL);
1312 1312
1313 if (flag & INS_BELOW_ORIGINATOR) 1313 if (flag & INS_BELOW_ORIGINATOR)
1314 { 1314 {
1315 if (originator->map != op->map || originator->x != op->x || originator->y != op->y || !originator->is_on_map ()) 1315 if (originator->map != op->map || originator->x != op->x || originator->y != op->y)
1316 { 1316 {
1317 LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n"); 1317 LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n");
1318 abort (); 1318 abort ();
1319 } 1319 }
1320
1321 if (!originator->is_on_map ())
1322 LOG (llevDebug | logBacktrace, "insert_ob_in_map(%s) called with INS_BELOW_ORIGINATOR when originator '%s' not on map",
1323 op->debug_desc (), originator->debug_desc ());
1320 1324
1321 op->above = originator; 1325 op->above = originator;
1322 op->below = originator->below; 1326 op->below = originator->below;
1323 originator->below = op; 1327 originator->below = op;
1324 1328

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines