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

Comparing deliantra/server/socket/item.C (file contents):
Revision 1.53 by root, Sun Sep 30 20:22:25 2007 UTC vs.
Revision 1.57 by elmex, Mon Nov 26 12:54:32 2007 UTC

1/* 1/*
2 * This file is part of Crossfire TRT, the Roguelike Realtime MORPG. 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team 4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
6 * Copyright (©) 1992,2007 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
7 * 7 *
8 * Crossfire TRT is free software: you can redistribute it and/or modify 8 * Deliantra is free software: you can redistribute it and/or modify
9 * it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
10 * the Free Software Foundation, either version 3 of the License, or 10 * the Free Software Foundation, either version 3 of the License, or
11 * (at your option) any later version. 11 * (at your option) any later version.
12 * 12 *
13 * This program is distributed in the hope that it will be useful, 13 * This program is distributed in the hope that it will be useful,
… …
16 * GNU General Public License for more details. 16 * GNU General Public License for more details.
17 * 17 *
18 * You should have received a copy of the GNU General Public License 18 * You should have received a copy of the GNU General Public License
19 * along with this program. If not, see <http://www.gnu.org/licenses/>. 19 * along with this program. If not, see <http://www.gnu.org/licenses/>.
20 * 20 *
21 * The authors can be reached via e-mail to <crossfire@schmorp.de> 21 * The authors can be reached via e-mail to <support@deliantra.net>
22 */ 22 */
23 23
24/** 24/**
25 * \file 25 * \file
26 * Client/server logic. 26 * Client/server logic.
… …
800 tag_t tag = net_uint32 ((uint8 *)data + 1); 800 tag_t tag = net_uint32 ((uint8 *)data + 1);
801 object *op = esrv_get_ob_from_count (pl->ob, tag); 801 object *op = esrv_get_ob_from_count (pl->ob, tag);
802 802
803 if (!op) 803 if (!op)
804 { 804 {
805 new_draw_info (NDI_UNIQUE, 0, pl->ob, "Could not find object to lock/unlock"); 805 pl->failmsg ("Could not find object to lock/unlock");
806 return; 806 return;
807 } 807 }
808 808
809 if (!flag) 809 if (!flag)
810 CLEAR_FLAG (op, FLAG_INV_LOCKED); 810 CLEAR_FLAG (op, FLAG_INV_LOCKED);
… …
821 tag_t tag = net_uint32 ((uint8 *)data); 821 tag_t tag = net_uint32 ((uint8 *)data);
822 object *op = esrv_get_ob_from_count (pl->ob, tag); 822 object *op = esrv_get_ob_from_count (pl->ob, tag);
823 823
824 if (!op) 824 if (!op)
825 { 825 {
826 new_draw_info (NDI_UNIQUE, 0, pl->ob, "Could not find object to mark"); 826 pl->failmsg ("Could not find object to mark");
827 return; 827 return;
828 } 828 }
829 829
830 pl->mark = op; 830 pl->mark = op;
831 new_draw_info_format (NDI_UNIQUE, 0, pl->ob, "Marked item %s", query_name (op)); 831 pl->ob->statusmsg (format ("Marked item %s", query_name (op)));
832} 832}
833 833
834/** 834/**
835 * look_at prints items on the specified square. 835 * look_at prints items on the specified square.
836 * 836 *
… …
841look_at (player *pl, int dx, int dy) 841look_at (player *pl, int dx, int dy)
842{ 842{
843 dynbuf_text buf; 843 dynbuf_text buf;
844 object *ob = pl->ob; 844 object *ob = pl->ob;
845 845
846 if (!pl->observe->map)
847 return;
848
846 mapxy pos (pl->observe); 849 mapxy pos (pl->observe);
847 pos.move (dx, dy); 850 pos.move (dx, dy);
848 851
849 if (pos.normalise ()) 852 if (pos.normalise ())
850 for (object *tmp = pos->top; tmp; tmp = tmp->below) 853 for (object *tmp = pos->top; tmp; tmp = tmp->below)
… …
922 */ 925 */
923 if (op->inv && QUERY_FLAG (op, FLAG_APPLIED)) 926 if (op->inv && QUERY_FLAG (op, FLAG_APPLIED))
924 { 927 {
925 object *current, *next; 928 object *current, *next;
926 929
930 int cnt = MAX_ITEM_PER_DROP;
931
927 for (current = op->inv; current != NULL; current = next) 932 for (current = op->inv; current != NULL; current = next)
928 { 933 {
929 next = current->below; 934 next = current->below;
930 drop_object (pl, current, 0); 935 drop_object (pl, current, 0);
936
937 if (--cnt <= 0) break;
931 } 938 }
939
940 if (cnt <= 0)
941 op->failmsg ("Only dropped some items, can't drop that many items at once.");
932 942
933 esrv_update_item (UPD_WEIGHT, pl, op); 943 esrv_update_item (UPD_WEIGHT, pl, op);
934 } 944 }
935 else 945 else
936 drop_object (pl, op, nrof); 946 drop_object (pl, op, nrof);
947
948 update_after_inventory_change (pl);
937 949
938 return; 950 return;
939 } 951 }
940 else if (to == pl->count) 952 else if (to == pl->count)
941 { /* pick it up to the inventory */ 953 { /* pick it up to the inventory */
… …
959 * has already been done (eg, it can be picked up and fits in 971 * has already been done (eg, it can be picked up and fits in
960 * in a sack, so check for those things. We should also check 972 * in a sack, so check for those things. We should also check
961 * an make sure env is in fact a container for that matter. 973 * an make sure env is in fact a container for that matter.
962 */ 974 */
963 if (env->type == CONTAINER && can_pick (pl, op) && sack_can_hold (pl, env, op, nrof)) 975 if (env->type == CONTAINER && can_pick (pl, op) && sack_can_hold (pl, env, op, nrof))
976 {
964 put_object_in_sack (pl, env, op, nrof); 977 put_object_in_sack (pl, env, op, nrof);
978 update_after_inventory_change (pl);
979 }
965} 980}
966 981

Diff Legend

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