ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/server/pets.C
(Generate patch)

Comparing deliantra/server/server/pets.C (file contents):
Revision 1.43 by root, Tue Jan 22 16:22:45 2008 UTC vs.
Revision 1.44 by root, Tue Apr 15 14:21:04 2008 UTC

… …
292int 292int
293follow_owner (object *ob, object *owner) 293follow_owner (object *ob, object *owner)
294{ 294{
295 if (owner->flag [FLAG_REMOVED]) 295 if (owner->flag [FLAG_REMOVED])
296 return 0; // do nothing if the owner is removed 296 return 0; // do nothing if the owner is removed
297 else if (!owner->map || owner->map->in_memory != MAP_IN_MEMORY) 297 else if (!owner->map || owner->map->in_memory != MAP_ACTIVE)
298 LOG (llevError, "owner '%s' of the pet '%s' not on a map in memory!?\n", &owner->name, &ob->name); 298 LOG (llevError, "owner '%s' of the pet '%s' not on a map in memory!?\n", &owner->name, &ob->name);
299 else 299 else
300 { 300 {
301 int dir = find_free_spot (ob, owner->map, owner->x, owner->y, 1, SIZEOFFREE); 301 int dir = find_free_spot (ob, owner->map, owner->x, owner->y, 1, SIZEOFFREE);
302 302

Diff Legend

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