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.82 by root, Mon Dec 25 11:25:49 2006 UTC vs.
Revision 1.83 by root, Mon Dec 25 14:43:22 2006 UTC

691 */ 691 */
692 if (!op->map || op->map->in_memory == MAP_SAVING) 692 if (!op->map || op->map->in_memory == MAP_SAVING)
693 return; 693 return;
694 694
695 /* make sure the object is within map boundaries */ 695 /* make sure the object is within map boundaries */
696 if (op->x < 0 || op->x >= MAP_WIDTH (op->map) || op->y < 0 || op->y >= MAP_HEIGHT (op->map)) 696 if (op->x < 0 || op->x >= op->map->width || op->y < 0 || op->y >= op->map->height)
697 { 697 {
698 LOG (llevError, "update_object() called for object out of map!\n"); 698 LOG (llevError, "update_object() called for object out of map!\n");
699#ifdef MANY_CORES 699#ifdef MANY_CORES
700 abort (); 700 abort ();
701#endif 701#endif

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines