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.64 by root, Mon May 5 22:03:22 2008 UTC vs.
Revision 1.70 by root, Sun Aug 31 02:01:41 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 *
… …
253 * animation of face to the client. 113 * animation of face to the client.
254 */ 114 */
255static void 115static void
256add_object_to_socklist (client &ns, packet &sl, object *head) 116add_object_to_socklist (client &ns, packet &sl, object *head)
257{ 117{
258 int flags, len, anim_speed;
259 char item_n[MAX_BUF]; 118 char item_n[MAX_BUF];
260 const char *item_p; 119 const char *item_p;
261 120
262 flags = query_flags (head); 121 int flags = query_flags (head);
263 if (QUERY_FLAG (head, FLAG_NO_PICK)) 122 if (QUERY_FLAG (head, FLAG_NO_PICK))
264 flags |= F_NOPICK; 123 flags |= F_NOPICK;
265 124
266 ns.send_face (head->face, -50); 125 ns.send_face (head->face, -50);
267 ns.flush_fx (); 126 ns.flush_fx ();
… …
272 sl << uint32 (head->count) 131 sl << uint32 (head->count)
273 << uint32 (flags) 132 << uint32 (flags)
274 << uint32 (QUERY_FLAG (head, FLAG_NO_PICK) ? -1 : head->client_weight ()) 133 << uint32 (QUERY_FLAG (head, FLAG_NO_PICK) ? -1 : head->client_weight ())
275 << uint32 (head->face); 134 << uint32 (head->face);
276 135
136 int len;
137
277 if (!head->custom_name) 138 if (!head->custom_name)
278 { 139 {
279 strncpy (item_n, query_base_name (head, 0), 127); 140 strncpy (item_n, query_base_name (head, 0), 127);
280 item_n[127] = 0; 141 item_n[127] = 0;
281 len = strlen (item_n); 142 len = strlen (item_n);
… …
294 len += strlen (item_n + 1 + len) + 1; 155 len += strlen (item_n + 1 + len) + 1;
295 156
296 sl << data8 (item_n, len) 157 sl << data8 (item_n, len)
297 << uint16 (head->animation_id); 158 << uint16 (head->animation_id);
298 159
299 anim_speed = 0; 160 int anim_speed = !head->flag [FLAG_ANIMATE] ? 0
300 if (QUERY_FLAG (head, FLAG_ANIMATE)) 161 : head->anim_speed ? clamp (head->anim_speed, 1, 255)
301 { 162 : 1. / clamp (fabs (head->speed), 1./255., 1./1.);
302 if (head->anim_speed)
303 anim_speed = head->anim_speed;
304 else
305 {
306 if (fabs (head->speed) < 0.001)
307 anim_speed = 255;
308 else if (fabs (head->speed) >= 1.0)
309 anim_speed = 1;
310 else
311 anim_speed = (int) (1.0 / fabs (head->speed));
312 }
313
314 if (anim_speed > 255)
315 anim_speed = 255;
316 }
317 163
318 sl << uint8 (anim_speed) 164 sl << uint8 (anim_speed)
319 << uint32 (head->nrof); 165 << uint32 (head->nrof);
320 166
321 if (ns.itemcmd == 2) 167 if (ns.itemcmd == 2)
322 sl << uint16 (head->client_type); 168 sl << uint16 (head->client_type);
323
324 SET_FLAG (head, FLAG_CLIENT_SENT);
325} 169}
326 170
327static faceidx 171static faceidx
328need_face_now (player *pl, const char *name) 172need_face_now (player *pl, const char *name)
329{ 173{
… …
538 return; 382 return;
539 383
540 client *ns = pl->contr->ns; 384 client *ns = pl->contr->ns;
541 if (!ns) 385 if (!ns)
542 return; 386 return;
543
544 if (!QUERY_FLAG (op, FLAG_CLIENT_SENT))
545 {
546 /* FLAG_CLIENT_SENT is debug only. We are using it to see where
547 * this is happening - we can set a breakpoint here in the debugger
548 * and track back the call.
549 */
550 LOG (llevDebug, "We have not sent item %s (%d)\n", &op->name, op->count);
551 }
552 387
553 packet sl ("upditem"); 388 packet sl ("upditem");
554 389
555 sl << uint8 (flags); 390 sl << uint8 (flags);
556 391
… …
665 sl << uint32 (op->env ? op->env->count : 0); 500 sl << uint32 (op->env ? op->env->count : 0);
666 501
667 add_object_to_socklist (*pl->contr->ns, sl, op); 502 add_object_to_socklist (*pl->contr->ns, sl, op);
668 503
669 pl->contr->ns->send_packet (sl); 504 pl->contr->ns->send_packet (sl);
670 SET_FLAG (op, FLAG_CLIENT_SENT);
671} 505}
672 506
673/** 507/**
674 * Tells the client to delete an item. 508 * Tells the client to delete an item.
675 */ 509 */
… …
763 597
764 if (object *op = esrv_get_ob_from_count (pl->ob, tag)) 598 if (object *op = esrv_get_ob_from_count (pl->ob, tag))
765 { 599 {
766 std::string s = op->describe (pl->ob); 600 std::string s = op->describe (pl->ob);
767 601
602 if (msg_is_special (s.c_str (), false))
603 cfperl_expand_cfpod (pl, s);
604
768 packet sl ("ex"); 605 packet sl ("ex");
769 sl << ber32 (tag) << s.c_str (); 606 sl << ber32 (tag) << s.c_str ();
770 607
771 pl->ns->send_packet (sl); 608 pl->ns->send_packet (sl);
772 } 609 }
… …
909 746
910/** Move an object to a new location */ 747/** Move an object to a new location */
911void 748void
912esrv_move_object (object *pl, tag_t to, tag_t tag, long nrof) 749esrv_move_object (object *pl, tag_t to, tag_t tag, long nrof)
913{ 750{
914 object *op, *env;
915
916 op = esrv_get_ob_from_count (pl, tag); 751 object *op = esrv_get_ob_from_count (pl, tag);
917 if (!op) 752 if (!op)
918 { 753 {
919 LOG (llevDebug, "Player '%s' tried to move an unknown object (%ld)\n", &pl->name, tag); 754 LOG (llevDebug, "Player '%s' tried to move an unknown object (%ld)\n", &pl->name, tag);
920 return; 755 return;
921 } 756 }
… …
930 */ 765 */
931 if (op->inv && QUERY_FLAG (op, FLAG_APPLIED)) 766 if (op->inv && QUERY_FLAG (op, FLAG_APPLIED))
932 { 767 {
933 int cnt = MAX_ITEM_PER_DROP; 768 int cnt = MAX_ITEM_PER_DROP;
934 769
935 for (object *current = op->inv; current; ) 770 for (object *current = op->inv; current && cnt--; )
936 { 771 {
937 object *next = current->below; 772 object *next = current->below;
938
939 drop_object (pl, current, 0); 773 drop_object (pl, current, 0);
940
941 if (--cnt <= 0) break;
942
943 current = next; 774 current = next;
944 } 775 }
945 776
946 if (cnt <= 0) 777 if (cnt <= 0)
947 op->failmsg ("Only dropped some items, can't drop that many items at once."); 778 op->failmsg ("Only dropped some items, can't drop that many items at once.");
… …
960 pl->contr->count = nrof; 791 pl->contr->count = nrof;
961 pick_up (pl, op); 792 pick_up (pl, op);
962 return; 793 return;
963 } 794 }
964 795
965 env = esrv_get_ob_from_count (pl, to); 796 object *env = esrv_get_ob_from_count (pl, to);
966 if (!env) 797 if (!env)
967 { 798 {
968 LOG (llevDebug, "Player '%s' tried to move object to the unknown location (%d)\n", &pl->name, to); 799 LOG (llevDebug, "Player '%s' tried to move object to the unknown location (%d)\n", &pl->name, to);
969 return; 800 return;
970 } 801 }

Diff Legend

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