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.178 by root, Sun Aug 12 14:13:54 2007 UTC vs.
Revision 1.179 by root, Wed Aug 15 04:57:48 2007 UTC

1237 assert (!op->flag [FLAG_FREED]); 1237 assert (!op->flag [FLAG_FREED]);
1238 1238
1239 object *top, *floor = NULL; 1239 object *top, *floor = NULL;
1240 1240
1241 op->remove (); 1241 op->remove ();
1242
1243#if 0
1244 if (!m->active != !op->active)
1245 if (m->active)
1246 op->activate_recursive ();
1247 else
1248 op->deactivate_recursive ();
1249#endif
1250 1242
1251 if (out_of_map (m, op->x, op->y)) 1243 if (out_of_map (m, op->x, op->y))
1252 { 1244 {
1253 LOG (llevError, "Trying to insert object outside the map.\n%s\n", op->debug_desc ()); 1245 LOG (llevError, "Trying to insert object outside the map.\n%s\n", op->debug_desc ());
1254#ifdef MANY_CORES 1246#ifdef MANY_CORES

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines