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.63 by root, Thu Apr 24 00:30:52 2008 UTC vs.
Revision 1.69 by root, Mon Jul 14 23:47:06 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 169
324 SET_FLAG (head, FLAG_CLIENT_SENT); 170 SET_FLAG (head, FLAG_CLIENT_SENT);
325} 171}
172
173static faceidx
174need_face_now (player *pl, const char *name)
175{
176 faceidx face = face_find (name, empty_face);
177
178 pl->ns->send_face (face, -50);
179 pl->ns->flush_fx ();
180
181 return face;
182}
183
184#define FINGER_UP "finger_up.x11"
185#define FINGER_DOWN "finger_down.x11"
326 186
327/** 187/**
328 * Send the look window. Don't need to do animations here 188 * Send the look window. Don't need to do animations here
329 * This sends all the faces to the client, not just updates. This is 189 * This sends all the faces to the client, not just updates. This is
330 * because object ordering would otherwise be inconsistent. 190 * because object ordering would otherwise be inconsistent.
331 */ 191 */
332void 192void
333esrv_draw_look (player *pl) 193esrv_draw_look (player *pl)
334{ 194{
335 int got_one = 0, start_look = 0, end_look = 0;
336
337 object *ob = pl->ob; 195 object *ob = pl->ob;
338 196
339 if (!pl->ns->update_look) 197 if (!pl->ns->update_look)
340 { 198 {
341 LOG (llevDebug, "esrv_draw_look called when update_look was not set (player %s)\n", &ob->name); 199 LOG (llevDebug, "esrv_draw_look called when update_look was not set (player %s)\n", &ob->name);
… …
355 packet sl; 213 packet sl;
356 sl.printf ("item%d ", pl->ns->itemcmd); 214 sl.printf ("item%d ", pl->ns->itemcmd);
357 215
358 sl << uint32 (0); 216 sl << uint32 (0);
359 217
360 pl->ns->send_face (empty_face, -50); 218 int start_pos = pl->ns->look_position;
361 pl->ns->flush_fx (); 219 bool dirty = false;
362 220
363 if (pl->ns->look_position) 221 mapspace &ms = ob->ms ();
222
223 // manage a ring buffer of the "last FLOORBOX_PAGESIZE" items and
224 // start from the top
225 object *items [FLOORBOX_PAGESIZE];
226 int item_idx = 0, item_cnt = 0;
227 int pos = 0;
228
229 // find our items by walking down
230 object *item = ms.top;
231
232 for (; item && item_cnt < FLOORBOX_PAGESIZE; item = item->below)
233 {
234 if (!item->client_visible ())
235 continue;
236
237 if (++pos < start_pos)
238 continue;
239
240 // record item
241 items [item_idx] = item; item_idx = item_idx < FLOORBOX_PAGESIZE ? item_idx + 1 : 0;
242 item_cnt++;
243
244 // stop at first floor
245 if (item->flag [FLAG_IS_FLOOR])
246 {
247 // we are finished, don't append "next group of items"
248 // by setting item to ms.bot it becomes zero which is checked after the while loop
249 item = ms.bot;
250 }
364 { 251 }
365 char buf[80];
366 snprintf (buf, 80, "Apply this to see %d previous items", FLOORBOX_PAGESIZE);
367 252
253 // see if there are more if we cared - we ignore invisible objects
254 if (item)
255 {
256 /* What we basically do is make a 'fake' object - when the user applies it,
257 * we notice the special tag the object has, and act accordingly.
258 */
368 sl << uint32 (0x80000000 | (pl->ns->look_position - FLOORBOX_PAGESIZE)) 259 sl << uint32 (0x80000000 | (start_pos + FLOORBOX_PAGESIZE))
369 << uint32 (0) 260 << uint32 (0)
370 << sint32 (-1) 261 << uint32 ((uint32) - 1)
371 << uint32 (empty_face) 262 << uint32 (need_face_now (pl, FINGER_DOWN))
372 << data8 (buf) 263 << data8 ("Apply this to see the items below")
373 << uint16 (0) 264 << uint16 (0)
374 << uint8 (0) 265 << uint8 (0)
375 << uint32 (0); 266 << uint32 (0);
376 267
377 if (pl->ns->itemcmd == 2) 268 if (pl->ns->itemcmd == 2)
378 sl << uint16 (0); 269 sl << uint16 (0);
379 }
380 270
381 object *tmp = ob->ms ().top; 271 dirty = true;
382 for (object *last = 0; tmp != last; tmp = tmp->below)
383 { 272 }
384 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) && !last) 273
274 // now send out all items in the ring buffer in reverse order
275 while (item_cnt)
276 {
277 --item_cnt;
278 item_idx = (item_idx ? item_idx : FLOORBOX_PAGESIZE) - 1;
279 object *item = items [item_idx];
280
281 add_object_to_socklist (*pl->ns, sl, item->head_ ());
282
283 dirty = true;
284
285 // if packet got too large, send it and begin a new one
286 if (sl.length () > MAXSOCKBUF - MAXITEMLEN)
385 { 287 {
386 last = tmp->below; /* assumes double floor mode */ 288 pl->ns->send_packet (sl);
387 if (last && QUERY_FLAG (last, FLAG_IS_FLOOR)) 289
388 last = last->below; 290 sl.reset ();
291 sl.printf ("item%d ", pl->ns->itemcmd);
292 sl << uint32 (0);
293
294 dirty = false;
389 } 295 }
390
391 if (tmp->client_visible ())
392 {
393 if (++start_look < pl->ns->look_position)
394 continue;
395
396 end_look++;
397
398 if (end_look > FLOORBOX_PAGESIZE)
399 {
400 /* What we basically do is make a 'fake' object - when the user applies it,
401 * we notice the special tag the object has, and act accordingly.
402 */
403 sl << uint32 (0x80000000 | (pl->ns->look_position + FLOORBOX_PAGESIZE))
404 << uint32 (0)
405 << uint32 ((uint32) - 1)
406 << uint32 (empty_face)
407 << data8 ("Apply this to see next group of items")
408 << uint16 (0)
409 << uint8 (0)
410 << uint32 (0);
411
412 if (pl->ns->itemcmd == 2)
413 sl << uint16 (0);
414
415 break;
416 }
417
418 add_object_to_socklist (*pl->ns, sl, tmp->head_ ());
419 got_one++;
420
421 if (sl.length () > MAXSOCKBUF - MAXITEMLEN)
422 {
423 pl->ns->send_packet (sl);
424
425 sl.reset ();
426 sl.printf ("item%d ", pl->ns->itemcmd);
427 sl << uint32 (0);
428 got_one = 0;
429 }
430 }
431 } 296 }
432 297
433 if (got_one) 298 if (start_pos)
299 {
300 sl << uint32 (0x80000000 | (start_pos - FLOORBOX_PAGESIZE))
301 << uint32 (0)
302 << sint32 (-1)
303 << uint32 (need_face_now (pl, FINGER_UP))
304 << data8 ("Apply this to see the items higher up")
305 << uint16 (0)
306 << uint8 (0)
307 << uint32 (0);
308
309 if (pl->ns->itemcmd == 2)
310 sl << uint16 (0);
311
312 dirty = true;
313 }
314
315 if (dirty)
434 pl->ns->send_packet (sl); 316 pl->ns->send_packet (sl);
435
436} 317}
437 318
438/** 319/**
439 * Sends whole inventory. 320 * Sends whole inventory.
440 */ 321 */
… …
505 client *ns = pl->contr->ns; 386 client *ns = pl->contr->ns;
506 if (!ns) 387 if (!ns)
507 return; 388 return;
508 389
509 if (!QUERY_FLAG (op, FLAG_CLIENT_SENT)) 390 if (!QUERY_FLAG (op, FLAG_CLIENT_SENT))
510 {
511 /* FLAG_CLIENT_SENT is debug only. We are using it to see where 391 /* FLAG_CLIENT_SENT is debug only. We are using it to see where
512 * this is happening - we can set a breakpoint here in the debugger 392 * this is happening - we can set a breakpoint here in the debugger
513 * and track back the call. 393 * and track back the call.
514 */ 394 */
515 LOG (llevDebug, "We have not sent item %s (%d)\n", &op->name, op->count); 395 LOG (llevDebug | logBacktrace, "We have not sent item %s (%d)\n", &op->name, op->count);
516 }
517 396
518 packet sl ("upditem"); 397 packet sl ("upditem");
519 398
520 sl << uint8 (flags); 399 sl << uint8 (flags);
521 400
… …
699void 578void
700ExamineCmd (char *buf, int len, player *pl) 579ExamineCmd (char *buf, int len, player *pl)
701{ 580{
702 tag_t tag = atoi (buf); 581 tag_t tag = atoi (buf);
703 582
583 /* If the high bit is set, player applied a pseudo object. */
584 if (tag & 0x80000000)
585 {
586 pl->ns->look_position = tag & 0x7fffffff;
587 pl->ns->floorbox_update ();
588 return;
589 }
590
704 object *op = esrv_get_ob_from_count (pl->ob, tag); 591 object *op = esrv_get_ob_from_count (pl->ob, tag);
705 592
706 if (!op) 593 if (!op)
707 { 594 {
708 LOG (llevDebug, "Player '%s' tried to examine the unknown object (%ld)\n", &pl->ob->name, tag); 595 LOG (llevDebug, "Player '%s' tried to examine the unknown object (%ld)\n", &pl->ob->name, tag);
… …
719 tag_t tag = atoi (buf); 606 tag_t tag = atoi (buf);
720 607
721 if (object *op = esrv_get_ob_from_count (pl->ob, tag)) 608 if (object *op = esrv_get_ob_from_count (pl->ob, tag))
722 { 609 {
723 std::string s = op->describe (pl->ob); 610 std::string s = op->describe (pl->ob);
611
612 if (msg_is_special (s.c_str (), false))
613 cfperl_expand_cfpod (pl, s);
724 614
725 packet sl ("ex"); 615 packet sl ("ex");
726 sl << ber32 (tag) << s.c_str (); 616 sl << ber32 (tag) << s.c_str ();
727 617
728 pl->ns->send_packet (sl); 618 pl->ns->send_packet (sl);
… …
732/** Client wants to apply some object. Lets do so. */ 622/** Client wants to apply some object. Lets do so. */
733void 623void
734ApplyCmd (char *buf, int len, player *pl) 624ApplyCmd (char *buf, int len, player *pl)
735{ 625{
736 tag_t tag = atoi (buf); 626 tag_t tag = atoi (buf);
737
738 /* sort of a hack, but if the player saves and the player then manually
739 * applies a savebed (or otherwise tries to do stuff), we run into trouble.
740 */
741 if (QUERY_FLAG (pl->ob, FLAG_REMOVED))
742 return;
743 627
744 /* If the high bit is set, player applied a pseudo object. */ 628 /* If the high bit is set, player applied a pseudo object. */
745 if (tag & 0x80000000) 629 if (tag & 0x80000000)
746 { 630 {
747 pl->ns->look_position = tag & 0x7fffffff; 631 pl->ns->look_position = tag & 0x7fffffff;
… …
872 756
873/** Move an object to a new location */ 757/** Move an object to a new location */
874void 758void
875esrv_move_object (object *pl, tag_t to, tag_t tag, long nrof) 759esrv_move_object (object *pl, tag_t to, tag_t tag, long nrof)
876{ 760{
877 object *op, *env;
878
879 op = esrv_get_ob_from_count (pl, tag); 761 object *op = esrv_get_ob_from_count (pl, tag);
880 if (!op) 762 if (!op)
881 { 763 {
882 LOG (llevDebug, "Player '%s' tried to move an unknown object (%ld)\n", &pl->name, tag); 764 LOG (llevDebug, "Player '%s' tried to move an unknown object (%ld)\n", &pl->name, tag);
883 return; 765 return;
884 } 766 }
… …
893 */ 775 */
894 if (op->inv && QUERY_FLAG (op, FLAG_APPLIED)) 776 if (op->inv && QUERY_FLAG (op, FLAG_APPLIED))
895 { 777 {
896 int cnt = MAX_ITEM_PER_DROP; 778 int cnt = MAX_ITEM_PER_DROP;
897 779
898 for (object *current = op->inv; current; ) 780 for (object *current = op->inv; current && cnt--; )
899 { 781 {
900 object *next = current->below; 782 object *next = current->below;
901
902 drop_object (pl, current, 0); 783 drop_object (pl, current, 0);
903
904 if (--cnt <= 0) break;
905
906 current = next; 784 current = next;
907 } 785 }
908 786
909 if (cnt <= 0) 787 if (cnt <= 0)
910 op->failmsg ("Only dropped some items, can't drop that many items at once."); 788 op->failmsg ("Only dropped some items, can't drop that many items at once.");
… …
923 pl->contr->count = nrof; 801 pl->contr->count = nrof;
924 pick_up (pl, op); 802 pick_up (pl, op);
925 return; 803 return;
926 } 804 }
927 805
928 env = esrv_get_ob_from_count (pl, to); 806 object *env = esrv_get_ob_from_count (pl, to);
929 if (!env) 807 if (!env)
930 { 808 {
931 LOG (llevDebug, "Player '%s' tried to move object to the unknown location (%d)\n", &pl->name, to); 809 LOG (llevDebug, "Player '%s' tried to move object to the unknown location (%d)\n", &pl->name, to);
932 return; 810 return;
933 } 811 }

Diff Legend

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