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.138 by root, Sat Apr 21 16:56:29 2007 UTC vs.
Revision 1.139 by root, Sat Apr 21 17:34:22 2007 UTC

1180 1180
1181 object *tmp, *top, *floor = NULL; 1181 object *tmp, *top, *floor = NULL;
1182 1182
1183 op->remove (); 1183 op->remove ();
1184 1184
1185#if 0
1185 if (!m->active != !op->active) 1186 if (!m->active != !op->active)
1186 if (m->active) 1187 if (m->active)
1187 op->activate_recursive (); 1188 op->activate_recursive ();
1188 else 1189 else
1189 op->deactivate_recursive (); 1190 op->deactivate_recursive ();
1191#endif
1190 1192
1191 if (out_of_map (m, op->x, op->y)) 1193 if (out_of_map (m, op->x, op->y))
1192 { 1194 {
1193 LOG (llevError, "Trying to insert object outside the map.\n%s\n", op->debug_desc ()); 1195 LOG (llevError, "Trying to insert object outside the map.\n%s\n", op->debug_desc ());
1194#ifdef MANY_CORES 1196#ifdef MANY_CORES

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines