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.2 by elmex, Mon Aug 14 04:22:05 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.2 2006/08/14 04:22:05 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 LOG(llevDebug, "DROP EN\n");
1009 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))
1010 return; 1008 return;
1011 LOG(llevDebug, "DROP xxEN\n");
1012 1009
1013 if (floor 1010 if (floor
1014 && floor->type == SHOP_FLOOR 1011 && floor->type == SHOP_FLOOR
1015 && !QUERY_FLAG (tmp, FLAG_UNPAID) 1012 && !QUERY_FLAG (tmp, FLAG_UNPAID)
1016 && tmp->type != MONEY) 1013 && tmp->type != MONEY)
1887 return 1; 1884 return 1;
1888 } 1885 }
1889 buf[0]='\0'; 1886 buf[0]='\0';
1890 } 1887 }
1891 1888
1889 if (QUERY_FLAG(item, FLAG_UNPAID)) {
1890 new_draw_info(NDI_UNIQUE,0,op,"You can't rename an unpaid item! You should pay for it first.");
1891 return 1;
1892 }
1893
1892 /* Coming here, everything is fine... */ 1894 /* Coming here, everything is fine... */
1893 if(!strlen(buf)) { 1895 if(!strlen(buf)) {
1894 /* Clear custom name */ 1896 /* Clear custom name */
1895 if(item->custom_name) { 1897 if(item->custom_name) {
1896 FREE_AND_CLEAR_STR(item->custom_name); 1898 FREE_AND_CLEAR_STR(item->custom_name);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines