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

Comparing deliantra/server/server/c_object.C (file contents):
Revision 1.7 by root, Sun Aug 27 15:24:22 2006 UTC vs.
Revision 1.8 by root, Mon Aug 28 07:07:42 2006 UTC

1/* 1/*
2 * static char *rcsid_c_object_c = 2 * static char *rcsid_c_object_c =
3 * "$Id: c_object.C,v 1.7 2006/08/27 15:24:22 root Exp $"; 3 * "$Id: c_object.C,v 1.8 2006/08/28 07:07:42 root Exp $";
4 */ 4 */
5/* 5/*
6 CrossFire, A Multiplayer game for X-windows 6 CrossFire, A Multiplayer game for X-windows
7 7
8 Copyright (C) 2002 Mark Wedel & Crossfire Development Team 8 Copyright (C) 2002 Mark Wedel & Crossfire Development Team
688 } 688 }
689 689
690 for (floor = get_map_ob (op->map, op->x, op->y); floor; floor = floor->above) 690 for (floor = get_map_ob (op->map, op->x, op->y); floor; floor = floor->above)
691 if (INVOKE_OBJECT (DROP_ON, floor, ARG_OBJECT (tmp), ARG_OBJECT (op))) 691 if (INVOKE_OBJECT (DROP_ON, floor, ARG_OBJECT (tmp), ARG_OBJECT (op)))
692 return; 692 return;
693
694 floor = get_map_ob (op->map, op->x, op->y);
693 695
694 if (floor 696 if (floor
695 && floor->type == SHOP_FLOOR 697 && floor->type == SHOP_FLOOR
696 && !QUERY_FLAG (tmp, FLAG_UNPAID) 698 && !QUERY_FLAG (tmp, FLAG_UNPAID)
697 && tmp->type != MONEY) 699 && tmp->type != MONEY)

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines