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.49 by root, Sat Sep 16 22:24:12 2006 UTC vs.
Revision 1.50 by root, Sat Sep 16 22:40:22 2006 UTC

1213 1213
1214 tmp->contr->socket.update_look = 1; 1214 tmp->contr->socket.update_look = 1;
1215 } 1215 }
1216 1216
1217 /* See if player moving off should effect something */ 1217 /* See if player moving off should effect something */
1218 if (check_walk_off && ((op->move_type & tmp->move_off) && (op->move_type & ~tmp->move_off & ~tmp->move_block) == 0)) 1218 if (check_walk_off
1219 && ((op->move_type & tmp->move_off)
1220 && (op->move_type & ~tmp->move_off & ~tmp->move_block) == 0))
1219 { 1221 {
1220 move_apply (tmp, op, NULL); 1222 move_apply (tmp, op, NULL);
1221 1223
1222 if (op->destroyed ()); 1224 if (op->destroyed ())
1223 LOG (llevError, "BUG: remove_ob(): name %s, archname %s destroyed " "leaving object\n", &tmp->name, &tmp->arch->name); 1225 LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
1224 } 1226 }
1225 1227
1226 /* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */ 1228 /* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1227 1229
1228 if (tmp->above == tmp) 1230 if (tmp->above == tmp)

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines