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.282 by root, Tue Feb 17 03:53:31 2009 UTC vs.
Revision 1.283 by root, Sat Feb 21 06:25:46 2009 UTC

… …
1297 1297
1298 if (object *more = op->more) 1298 if (object *more = op->more)
1299 if (!insert_ob_in_map (more, m, originator, flag)) 1299 if (!insert_ob_in_map (more, m, originator, flag))
1300 return 0; 1300 return 0;
1301 1301
1302 CLEAR_FLAG (op, FLAG_REMOVED); 1302 op->flag [FLAG_REMOVED] = false;
1303 1303 op->env = 0;
1304 op->map = newmap; 1304 op->map = newmap;
1305
1305 mapspace &ms = op->ms (); 1306 mapspace &ms = op->ms ();
1306 1307
1307 /* this has to be done after we translate the coordinates. 1308 /* this has to be done after we translate the coordinates.
1308 */ 1309 */
1309 if (op->nrof && !(flag & INS_NO_MERGE)) 1310 if (op->nrof && !(flag & INS_NO_MERGE))

Diff Legend

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