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.78 by root, Mon Apr 27 01:38:49 2009 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{
… …
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 387
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
553 packet sl ("upditem"); 388 packet sl ("upditem");
554 389
555 sl << uint8 (flags); 390 sl << uint8 (flags);
556 391
557 op = op->head_ (); 392 op = op->head_ ();
… …
564 if (flags & UPD_FLAGS) 399 if (flags & UPD_FLAGS)
565 sl << uint32 (query_flags (op)); 400 sl << uint32 (query_flags (op));
566 401
567 if (flags & UPD_WEIGHT) 402 if (flags & UPD_WEIGHT)
568 { 403 {
569 sint32 weight = op->flag [FLAG_NO_PICK] ? -1 : op->client_weight (); 404 sint32 weight = op->client_weight ();
570 405
571 if (op) 406 if (op == pl)
572 ns->last_weight = weight; 407 ns->last_weight = weight;
573 408
574 sl << uint32 (weight); 409 sl << uint32 (weight);
575 } 410 }
576 411
… …
583 418
584 if (flags & UPD_NAME) 419 if (flags & UPD_NAME)
585 { 420 {
586 int len; 421 int len;
587 const char *item_p; 422 const char *item_p;
588 char item_n[MAX_BUF]; 423 char item_n[127 * 2];
589 424
590 if (!op->custom_name) 425 if (!op->custom_name)
591 { 426 {
592 strncpy (item_n, query_base_name (op, 0), 127); 427 len = assign (item_n, query_base_name (op, 0), 127);
593 item_n[127] = 0;
594 len = strlen (item_n);
595 item_p = query_base_name (op, 1); 428 item_p = query_base_name (op, 1);
596 } 429 }
597 else 430 else
598 { 431 {
599 strncpy (item_n, op->custom_name, 127); 432 len = assign (item_n, &op->custom_name, 127);
600 item_n[127] = 0;
601 len = strlen (item_n);
602 item_p = op->custom_name; 433 item_p = &op->custom_name;
603 } 434 }
604 435
605 strncpy (item_n + len + 1, item_p, 127); 436 len += assign (item_n + len, item_p, 127);
606 item_n[254] = 0;
607 len += strlen (item_n + 1 + len) + 1;
608 437
609 sl << data8 (item_n, len); 438 sl << data8 (item_n, len);
610 } 439 }
611 440
612 if (flags & UPD_ANIM) 441 if (flags & UPD_ANIM)
… …
665 sl << uint32 (op->env ? op->env->count : 0); 494 sl << uint32 (op->env ? op->env->count : 0);
666 495
667 add_object_to_socklist (*pl->contr->ns, sl, op); 496 add_object_to_socklist (*pl->contr->ns, sl, op);
668 497
669 pl->contr->ns->send_packet (sl); 498 pl->contr->ns->send_packet (sl);
670 SET_FLAG (op, FLAG_CLIENT_SENT);
671} 499}
672 500
673/** 501/**
674 * Tells the client to delete an item. 502 * Tells the client to delete an item.
675 */ 503 */
… …
764 if (object *op = esrv_get_ob_from_count (pl->ob, tag)) 592 if (object *op = esrv_get_ob_from_count (pl->ob, tag))
765 { 593 {
766 std::string s = op->describe (pl->ob); 594 std::string s = op->describe (pl->ob);
767 595
768 packet sl ("ex"); 596 packet sl ("ex");
769 sl << ber32 (tag) << s.c_str (); 597 sl << ber32 (tag)
598 << data (*pl->expand_cfpod (s.c_str ()));
770 599
771 pl->ns->send_packet (sl); 600 pl->ns->send_packet (sl);
772 } 601 }
773} 602}
774 603
… …
843 * Tero.Haatanen@lut.fi ] 672 * Tero.Haatanen@lut.fi ]
844 */ 673 */
845static void 674static void
846look_at (player *pl, int dx, int dy) 675look_at (player *pl, int dx, int dy)
847{ 676{
848 dynbuf_text buf; 677 dynbuf_text &buf = msg_dynbuf; buf.clear ();
849 object *ob = pl->ob; 678 object *ob = pl->ob;
850 679
851 if (!pl->observe->map) 680 if (!pl->observe->map)
852 return; 681 return;
853 682
683 bool wiz = ob->flag [FLAG_WIZ] || ob->flag [FLAG_WIZLOOK];
684
854 mapxy pos (pl->observe); 685 mapxy pos (pl->observe);
855 pos.move (dx, dy); 686 pos.move (dx, dy);
856 687
688 if (wiz)
689 {
857 if (pos.normalise ()) 690 if (pos.normalise ())
691 {
692 mapspace &ms = *pos;
693 ms.update ();
694
695 buf.printf (" map: %s%+d%+d (%+d%+d)\n"
696 " smell %u/%u; flags %x; light %d; block %x; slow %x; on %x; off %x; volume %lld\n\n",
697 &pos.m->path, pos.x, pos.y, dx, dy,
698 (unsigned int)ms.smell, (unsigned int)mapspace::smellcount, ms.flags (), ms.light,
699 ms.move_block, ms.move_slow, ms.move_on, ms.move_off, (long long)ms.volume ()
700 );
701 }
702 else
703 buf << "off-map\n\n";
704 }
705
706 int darkness = pl->blocked_los (dx, dy);
707
708 if (darkness == LOS_BLOCKED)
709 buf << "You cannot see that place from your position. H<Something is in between or it is too far away.>";
710 else if (darkness == LOS_MAX)
711 buf << "That place is too dark to see anything. H<Move nearer or find better lighting.>";
712 else
713 {
714 if (pos.normalise ())
858 for (object *tmp = pos->top; tmp; tmp = tmp->below) 715 for (object *tmp = pos->top; tmp; tmp = tmp->below)
859 { 716 {
860 if (tmp->invisible && !QUERY_FLAG (ob, FLAG_WIZ)) 717 if (tmp->invisible && !QUERY_FLAG (ob, FLAG_WIZ))
861 continue; 718 continue;
862 719
863 if (QUERY_FLAG (ob, FLAG_WIZ)) 720 if (wiz)
864 buf.printf ("- %s (%d).\n", query_name (tmp), tmp->count); 721 buf.printf (" - %s (%d).\n", query_name (tmp), tmp->count);
865 else 722 else
866 buf.printf ("- %s.\n", query_name (tmp)); 723 buf.printf (" - %s.\n", query_name (tmp));
867 724
868 object *head = tmp->head_ (); 725 object *head = tmp->head_ ();
869 726
870 if (head->inv) 727 if (head->inv)
871 if ((head->type != CONTAINER && head->type != FLESH) 728 if ((head->type != CONTAINER && head->type != FLESH)
872 || QUERY_FLAG (ob, FLAG_WIZ)) 729 || QUERY_FLAG (ob, FLAG_WIZ))
873 buf << head->query_inventory (ob, " "); 730 buf << head->query_inventory (ob, " ");
874 731
875 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) && !QUERY_FLAG (ob, FLAG_WIZ)) /* don't continue under the floor */ 732 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) && !wiz) /* don't continue under the floor */
876 break; 733 break;
734 }
877 } 735 }
878 736
879 if (buf.empty ()) 737 if (buf.empty ())
880 pl->failmsg ("You see nothing there."); 738 buf << "You see nothing there.";
881 else 739
882 pl->infobox (MSG_CHANNEL ("lookat"), buf); 740 pl->infobox (MSG_CHANNEL ("lookat"), buf);
883} 741}
884 742
885/** Client wants to look at some object. Lets do so. */ 743/** Client wants to look at some object. Lets do so. */
886void 744void
887LookAt (char *buf, int len, player *pl) 745LookAt (char *buf, int len, player *pl)
… …
892 if (!(cp = strchr (buf, ' '))) 750 if (!(cp = strchr (buf, ' ')))
893 return; 751 return;
894 752
895 int dy = atoi (cp); 753 int dy = atoi (cp);
896 754
897 if (player *opl = pl->observe->contr)
898 if (client *ns = opl->ns)
899 {
900 if (fabs (dx) > ns->mapx / 2 || fabs (dy) > ns->mapy / 2)
901 return;
902
903 if (opl->blocked_los[dx + ns->mapx / 2][dy + ns->mapy / 2])
904 return;
905 }
906
907 look_at (pl, dx, dy); 755 look_at (pl, dx, dy);
908} 756}
909 757
910/** Move an object to a new location */ 758/** Move an object to a new location */
911void 759void
912esrv_move_object (object *pl, tag_t to, tag_t tag, long nrof) 760esrv_move_object (object *pl, tag_t to, tag_t tag, long nrof)
913{ 761{
914 object *op, *env;
915
916 op = esrv_get_ob_from_count (pl, tag); 762 object *op = esrv_get_ob_from_count (pl, tag);
917 if (!op) 763 if (!op)
918 { 764 {
919 LOG (llevDebug, "Player '%s' tried to move an unknown object (%ld)\n", &pl->name, tag); 765 LOG (llevDebug, "Player '%s' tried to move an unknown object (%ld)\n", &pl->name, tag);
920 return; 766 return;
921 } 767 }
… …
930 */ 776 */
931 if (op->inv && QUERY_FLAG (op, FLAG_APPLIED)) 777 if (op->inv && QUERY_FLAG (op, FLAG_APPLIED))
932 { 778 {
933 int cnt = MAX_ITEM_PER_DROP; 779 int cnt = MAX_ITEM_PER_DROP;
934 780
935 for (object *current = op->inv; current; ) 781 for (object *current = op->inv; current && cnt--; )
936 { 782 {
937 object *next = current->below; 783 object *next = current->below;
938
939 drop_object (pl, current, 0); 784 drop_object (pl, current, 0);
940
941 if (--cnt <= 0) break;
942
943 current = next; 785 current = next;
944 } 786 }
945 787
946 if (cnt <= 0) 788 if (cnt <= 0)
947 op->failmsg ("Only dropped some items, can't drop that many items at once."); 789 op->failmsg ("Only dropped some items, can't drop that many items at once.");
… …
960 pl->contr->count = nrof; 802 pl->contr->count = nrof;
961 pick_up (pl, op); 803 pick_up (pl, op);
962 return; 804 return;
963 } 805 }
964 806
965 env = esrv_get_ob_from_count (pl, to); 807 object *env = esrv_get_ob_from_count (pl, to);
966 if (!env) 808 if (!env)
967 { 809 {
968 LOG (llevDebug, "Player '%s' tried to move object to the unknown location (%d)\n", &pl->name, to); 810 LOG (llevDebug, "Player '%s' tried to move object to the unknown location (%d)\n", &pl->name, to);
969 return; 811 return;
970 } 812 }

Diff Legend

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