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.260 by root, Mon Sep 29 10:35:36 2008 UTC vs.
Revision 1.261 by root, Wed Oct 1 16:04:16 2008 UTC

… …
1263 * just 'op' otherwise 1263 * just 'op' otherwise
1264 */ 1264 */
1265object * 1265object *
1266insert_ob_in_map (object *op, maptile *m, object *originator, int flag) 1266insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1267{ 1267{
1268 if (op->is_on_map ())
1269 {
1270 LOG (llevError, "insert_ob_in_map called for object already on map");
1271 abort ();
1272 }
1273
1274 if (op->env)
1275 {
1276 LOG (llevError, "insert_ob_in_map called for object in an inventory (proceeding)");
1277 op->remove (); 1268 op->remove ();
1278 }
1279 1269
1280 if (m == &freed_map)//D TODO: remove soon 1270 if (m == &freed_map)//D TODO: remove soon
1281 {//D 1271 {//D
1282 LOG (llevError | logBacktrace, "tries to insret object on freed objects map: %s", op->debug_desc ());//D 1272 LOG (llevError | logBacktrace, "tries to insret object on freed objects map: %s", op->debug_desc ());//D
1283 }//D 1273 }//D

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines