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.65 by root, Tue May 6 16:32:34 2008 UTC vs.
Revision 1.73 by root, Mon Dec 8 15:40:13 2008 UTC

… …
36#include <object.h> 36#include <object.h>
37#include <sproto.h> 37#include <sproto.h>
38 38
39/** This is the maximum number of bytes we expect any one item to take up */ 39/** This is the maximum number of bytes we expect any one item to take up */
40#define MAXITEMLEN 300 40#define MAXITEMLEN 300
41
42#if 0
43tag_t
44client_container::tag () const
45{
46 switch (type)
47 {
48 case CC_INVENTORY:
49 return ns->pl->count;
50 case CC_MAPSPACE:
51 return 0;
52 case CC_CONTAINER:
53 return env->count;
54 }
55
56 abort ();
57}
58
59void
60client_container::clear ()
61{
62 switch (type)
63 {
64 case CC_INVENTORY:
65 abort ();
66
67 case CC_MAPSPACE:
68 case CC_CONTAINER:
69 ns->send_packet_printf ("delinv %d", tag ());
70 break;
71 }
72
73 for (iterator i = begin (); i != end (); ++i)
74 i->op->seen_by = 0;
75
76 vector< refitem, slice_allocator<refitem> >::clear ();
77}
78
79inline iterator
80client_container::merge_item (iterator i, object *op)
81{
82 if (i != end () && i->op == op)
83 return ++i;
84
85 if (op->seen_by)
86 return; // seen by another entity already
87
88 op->seen_by = this;
89
90 refitem ref;
91 ref.op = op;
92
93 return insert (i, ref);
94}
95
96void
97client_container::update (int offset)
98{
99 iterator i = begin ();
100
101 switch (type)
102 {
103 case CC_INVENTORY:
104 case CC_CONTAINER:
105 {
106 object *env = type == CC_INVENTORY
107 ? ns->pl->ob
108 : this->env;
109
110 // pass 1, erase all objects no longer in container
111 for (iterator j = begin (); j != end (); ++j)
112 if (j->op->env != env)
113 {
114 j->op->seen_by = 0;
115 erase (j);
116 }
117
118 // pass 2 merge items
119 for (object *op = env->inv; op; op = op->below)
120 {
121 if (--offset < 0)
122 i = merge_item (i, op);
123 else if (offset < -FLOORBOX_PAGESIZE)
124 break;
125 }
126 }
127 break;
128
129 case CC_MAPSPACE:
130 {
131 // pass 1, erase all objects no longer on space
132 for (iterator j = begin (); j != end (); ++j)
133 if (j->op->x != x || j->op->y != y || j->op->map != map)
134 {
135 j->op->seen_by = 0;
136 erase (j);
137 }
138
139 // pass 2 merge items
140 for (object *op = GET_MAP_OB (map, x, y); op; op = op->above)
141 {
142 if (--offset < 0)
143 i = merge_item (i, op);
144 else if (offset < -FLOORBOX_PAGESIZE)
145 break;
146 }
147 }
148 break;
149 }
150
151 // pass 3, erase all extra items
152 for (iterator j = i; j != end (); ++j)
153 j->op->seen_by = 0;
154
155 if (i != end ())
156 erase (i, end ());
157}
158
159void
160client_container::set_mapspace (maptile *map, int x, int y)
161{
162 if (type == CC_MAPSPACE
163 && this->map == map
164 && this->x == x
165 && this->y == y)
166 return;
167
168 clear ();
169
170 type = CC_MAPSPACE;
171 this->map = map;
172 this->x = x;
173 this->y = y;
174}
175
176void
177client_container::set_container (object *env)
178{
179}
180#endif
181 41
182/******************************************************************************* 42/*******************************************************************************
183 * 43 *
184 * Functions related to sending object data to the client. 44 * Functions related to sending object data to the client.
185 * 45 *
… …
304 sl << uint8 (anim_speed) 164 sl << uint8 (anim_speed)
305 << uint32 (head->nrof); 165 << uint32 (head->nrof);
306 166
307 if (ns.itemcmd == 2) 167 if (ns.itemcmd == 2)
308 sl << uint16 (head->client_type); 168 sl << uint16 (head->client_type);
309
310 SET_FLAG (head, FLAG_CLIENT_SENT);
311} 169}
312 170
313static faceidx 171static faceidx
314need_face_now (player *pl, const char *name) 172need_face_now (player *pl, const char *name)
315{ 173{
… …
525 383
526 client *ns = pl->contr->ns; 384 client *ns = pl->contr->ns;
527 if (!ns) 385 if (!ns)
528 return; 386 return;
529 387
530 if (!QUERY_FLAG (op, FLAG_CLIENT_SENT))
531 {
532 /* FLAG_CLIENT_SENT is debug only. We are using it to see where
533 * this is happening - we can set a breakpoint here in the debugger
534 * and track back the call.
535 */
536 LOG (llevDebug, "We have not sent item %s (%d)\n", &op->name, op->count);
537 }
538
539 packet sl ("upditem"); 388 packet sl ("upditem");
540 389
541 sl << uint8 (flags); 390 sl << uint8 (flags);
542 391
543 op = op->head_ (); 392 op = op->head_ ();
… …
550 if (flags & UPD_FLAGS) 399 if (flags & UPD_FLAGS)
551 sl << uint32 (query_flags (op)); 400 sl << uint32 (query_flags (op));
552 401
553 if (flags & UPD_WEIGHT) 402 if (flags & UPD_WEIGHT)
554 { 403 {
555 sint32 weight = op->flag [FLAG_NO_PICK] ? -1 : op->client_weight (); 404 sint32 weight = op->client_weight ();
556 405
557 if (op) 406 if (op == pl)
558 ns->last_weight = weight; 407 ns->last_weight = weight;
559 408
560 sl << uint32 (weight); 409 sl << uint32 (weight);
561 } 410 }
562 411
… …
651 sl << uint32 (op->env ? op->env->count : 0); 500 sl << uint32 (op->env ? op->env->count : 0);
652 501
653 add_object_to_socklist (*pl->contr->ns, sl, op); 502 add_object_to_socklist (*pl->contr->ns, sl, op);
654 503
655 pl->contr->ns->send_packet (sl); 504 pl->contr->ns->send_packet (sl);
656 SET_FLAG (op, FLAG_CLIENT_SENT);
657} 505}
658 506
659/** 507/**
660 * Tells the client to delete an item. 508 * Tells the client to delete an item.
661 */ 509 */
… …
750 if (object *op = esrv_get_ob_from_count (pl->ob, tag)) 598 if (object *op = esrv_get_ob_from_count (pl->ob, tag))
751 { 599 {
752 std::string s = op->describe (pl->ob); 600 std::string s = op->describe (pl->ob);
753 601
754 packet sl ("ex"); 602 packet sl ("ex");
755 sl << ber32 (tag) << s.c_str (); 603 sl << ber32 (tag)
604 << data (*pl->expand_cfpod (s.c_str ()));
756 605
757 pl->ns->send_packet (sl); 606 pl->ns->send_packet (sl);
758 } 607 }
759} 608}
760 609
… …
845 { 694 {
846 if (tmp->invisible && !QUERY_FLAG (ob, FLAG_WIZ)) 695 if (tmp->invisible && !QUERY_FLAG (ob, FLAG_WIZ))
847 continue; 696 continue;
848 697
849 if (QUERY_FLAG (ob, FLAG_WIZ)) 698 if (QUERY_FLAG (ob, FLAG_WIZ))
850 buf.printf ("- %s (%d).\n", query_name (tmp), tmp->count); 699 buf.printf (" - %s (%d).\n", query_name (tmp), tmp->count);
851 else 700 else
852 buf.printf ("- %s.\n", query_name (tmp)); 701 buf.printf (" - %s.\n", query_name (tmp));
853 702
854 object *head = tmp->head_ (); 703 object *head = tmp->head_ ();
855 704
856 if (head->inv) 705 if (head->inv)
857 if ((head->type != CONTAINER && head->type != FLESH) 706 if ((head->type != CONTAINER && head->type != FLESH)
858 || QUERY_FLAG (ob, FLAG_WIZ)) 707 || QUERY_FLAG (ob, FLAG_WIZ))
859 buf << head->query_inventory (ob, " "); 708 buf << head->query_inventory (ob, " ");
860 709
861 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) && !QUERY_FLAG (ob, FLAG_WIZ)) /* don't continue under the floor */ 710 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) && !QUERY_FLAG (ob, FLAG_WIZ)) /* don't continue under the floor */
862 break; 711 break;
863 } 712 }
864 713
… …
884 if (client *ns = opl->ns) 733 if (client *ns = opl->ns)
885 { 734 {
886 if (fabs (dx) > ns->mapx / 2 || fabs (dy) > ns->mapy / 2) 735 if (fabs (dx) > ns->mapx / 2 || fabs (dy) > ns->mapy / 2)
887 return; 736 return;
888 737
889 if (opl->blocked_los[dx + ns->mapx / 2][dy + ns->mapy / 2]) 738 if (opl->blocked_los[dx + ns->mapx / 2][dy + ns->mapy / 2] < LOS_MAX)
890 return; 739 return;
891 } 740 }
892 741
893 look_at (pl, dx, dy); 742 look_at (pl, dx, dy);
894} 743}
895 744
896/** Move an object to a new location */ 745/** Move an object to a new location */
897void 746void
898esrv_move_object (object *pl, tag_t to, tag_t tag, long nrof) 747esrv_move_object (object *pl, tag_t to, tag_t tag, long nrof)
899{ 748{
900 object *op, *env;
901
902 op = esrv_get_ob_from_count (pl, tag); 749 object *op = esrv_get_ob_from_count (pl, tag);
903 if (!op) 750 if (!op)
904 { 751 {
905 LOG (llevDebug, "Player '%s' tried to move an unknown object (%ld)\n", &pl->name, tag); 752 LOG (llevDebug, "Player '%s' tried to move an unknown object (%ld)\n", &pl->name, tag);
906 return; 753 return;
907 } 754 }
… …
916 */ 763 */
917 if (op->inv && QUERY_FLAG (op, FLAG_APPLIED)) 764 if (op->inv && QUERY_FLAG (op, FLAG_APPLIED))
918 { 765 {
919 int cnt = MAX_ITEM_PER_DROP; 766 int cnt = MAX_ITEM_PER_DROP;
920 767
921 for (object *current = op->inv; current; ) 768 for (object *current = op->inv; current && cnt--; )
922 { 769 {
923 object *next = current->below; 770 object *next = current->below;
924
925 drop_object (pl, current, 0); 771 drop_object (pl, current, 0);
926
927 if (--cnt <= 0) break;
928
929 current = next; 772 current = next;
930 } 773 }
931 774
932 if (cnt <= 0) 775 if (cnt <= 0)
933 op->failmsg ("Only dropped some items, can't drop that many items at once."); 776 op->failmsg ("Only dropped some items, can't drop that many items at once.");
… …
946 pl->contr->count = nrof; 789 pl->contr->count = nrof;
947 pick_up (pl, op); 790 pick_up (pl, op);
948 return; 791 return;
949 } 792 }
950 793
951 env = esrv_get_ob_from_count (pl, to); 794 object *env = esrv_get_ob_from_count (pl, to);
952 if (!env) 795 if (!env)
953 { 796 {
954 LOG (llevDebug, "Player '%s' tried to move object to the unknown location (%d)\n", &pl->name, to); 797 LOG (llevDebug, "Player '%s' tried to move object to the unknown location (%d)\n", &pl->name, to);
955 return; 798 return;
956 } 799 }

Diff Legend

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