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.4 by elmex, Thu Aug 17 08:07:38 2006 UTC vs.
Revision 1.5 by elmex, Sun Aug 20 21:26:03 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.4 2006/08/17 08:07:38 elmex Exp $"; 3 * "$Id: c_object.C,v 1.5 2006/08/20 21:26:03 elmex 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
1001 op->contr->socket.update_look = 1; 1001 op->contr->socket.update_look = 1;
1002 /* Need to update the weight for the player */ 1002 /* Need to update the weight for the player */
1003 esrv_send_item (op, op); 1003 esrv_send_item (op, op);
1004 } 1004 }
1005 1005
1006 floor = get_map_ob (op->map, op->x, op->y); 1006 for (floor = get_map_ob (op->map, op->x, op->y); floor; floor = floor->above)
1007
1008 if (execute_event (floor, EVENT_DROP_ON, op, tmp, NULL, SCRIPT_FIX_ALL)) 1007 if (execute_event (floor, EVENT_DROP_ON, op, tmp, NULL, SCRIPT_FIX_ALL))
1009 return; 1008 return;
1010 1009
1011 if (floor 1010 if (floor
1012 && floor->type == SHOP_FLOOR 1011 && floor->type == SHOP_FLOOR
1013 && !QUERY_FLAG (tmp, FLAG_UNPAID) 1012 && !QUERY_FLAG (tmp, FLAG_UNPAID)
1014 && tmp->type != MONEY) 1013 && tmp->type != MONEY)

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines