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.76 by root, Sun Dec 28 06:59:27 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
… …
835 object *ob = pl->ob; 684 object *ob = pl->ob;
836 685
837 if (!pl->observe->map) 686 if (!pl->observe->map)
838 return; 687 return;
839 688
689 bool wiz = ob->flag [FLAG_WIZ] || ob->flag [FLAG_WIZLOOK];
690
840 mapxy pos (pl->observe); 691 mapxy pos (pl->observe);
841 pos.move (dx, dy); 692 pos.move (dx, dy);
842 693
694 if (wiz)
695 {
843 if (pos.normalise ()) 696 if (pos.normalise ())
697 {
698 mapspace &ms = *pos;
699 ms.update ();
700
701 buf.printf (" map: %s%+d%+d (%+d%+d)\n"
702 " smell %u/%u; flags %x; light %d; block %x; slow %x; on %x; off %x; volume %lld\n\n",
703 &pos.m->path, pos.x, pos.y, dx, dy,
704 (unsigned int)ms.smell, (unsigned int)mapspace::smellcount, ms.flags (), ms.light,
705 ms.move_block, ms.move_slow, ms.move_on, ms.move_off, (long long)ms.volume ()
706 );
707 }
708 else
709 buf << "off-map\n\n";
710 }
711
712 int darkness = pl->blocked_los (dx, dy);
713
714 if (darkness == LOS_BLOCKED)
715 buf << "You cannot see that place from your position. H<Something is in between or it is too far away.>";
716 else if (darkness == LOS_MAX)
717 buf << "That place is too dark to see anything. H<Move nearer or find better lighting.>";
718 else
719 {
720 if (pos.normalise ())
844 for (object *tmp = pos->top; tmp; tmp = tmp->below) 721 for (object *tmp = pos->top; tmp; tmp = tmp->below)
845 { 722 {
846 if (tmp->invisible && !QUERY_FLAG (ob, FLAG_WIZ)) 723 if (tmp->invisible && !QUERY_FLAG (ob, FLAG_WIZ))
847 continue; 724 continue;
848 725
849 if (QUERY_FLAG (ob, FLAG_WIZ)) 726 if (wiz)
850 buf.printf ("- %s (%d).\n", query_name (tmp), tmp->count); 727 buf.printf (" - %s (%d).\n", query_name (tmp), tmp->count);
851 else 728 else
852 buf.printf ("- %s.\n", query_name (tmp)); 729 buf.printf (" - %s.\n", query_name (tmp));
853 730
854 object *head = tmp->head_ (); 731 object *head = tmp->head_ ();
855 732
856 if (head->inv) 733 if (head->inv)
857 if ((head->type != CONTAINER && head->type != FLESH) 734 if ((head->type != CONTAINER && head->type != FLESH)
858 || QUERY_FLAG (ob, FLAG_WIZ)) 735 || QUERY_FLAG (ob, FLAG_WIZ))
859 buf << head->query_inventory (ob, " "); 736 buf << head->query_inventory (ob, " ");
860 737
861 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) && !QUERY_FLAG (ob, FLAG_WIZ)) /* don't continue under the floor */ 738 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) && !wiz) /* don't continue under the floor */
862 break; 739 break;
740 }
863 } 741 }
864 742
865 if (buf.empty ()) 743 if (buf.empty ())
866 pl->failmsg ("You see nothing there."); 744 buf << "You see nothing there.";
867 else 745
868 pl->infobox (MSG_CHANNEL ("lookat"), buf); 746 pl->infobox (MSG_CHANNEL ("lookat"), buf);
869} 747}
870 748
871/** Client wants to look at some object. Lets do so. */ 749/** Client wants to look at some object. Lets do so. */
872void 750void
873LookAt (char *buf, int len, player *pl) 751LookAt (char *buf, int len, player *pl)
… …
878 if (!(cp = strchr (buf, ' '))) 756 if (!(cp = strchr (buf, ' ')))
879 return; 757 return;
880 758
881 int dy = atoi (cp); 759 int dy = atoi (cp);
882 760
883 if (player *opl = pl->observe->contr)
884 if (client *ns = opl->ns)
885 {
886 if (fabs (dx) > ns->mapx / 2 || fabs (dy) > ns->mapy / 2)
887 return;
888
889 if (opl->blocked_los[dx + ns->mapx / 2][dy + ns->mapy / 2])
890 return;
891 }
892
893 look_at (pl, dx, dy); 761 look_at (pl, dx, dy);
894} 762}
895 763
896/** Move an object to a new location */ 764/** Move an object to a new location */
897void 765void
898esrv_move_object (object *pl, tag_t to, tag_t tag, long nrof) 766esrv_move_object (object *pl, tag_t to, tag_t tag, long nrof)
899{ 767{
900 object *op, *env;
901
902 op = esrv_get_ob_from_count (pl, tag); 768 object *op = esrv_get_ob_from_count (pl, tag);
903 if (!op) 769 if (!op)
904 { 770 {
905 LOG (llevDebug, "Player '%s' tried to move an unknown object (%ld)\n", &pl->name, tag); 771 LOG (llevDebug, "Player '%s' tried to move an unknown object (%ld)\n", &pl->name, tag);
906 return; 772 return;
907 } 773 }
… …
916 */ 782 */
917 if (op->inv && QUERY_FLAG (op, FLAG_APPLIED)) 783 if (op->inv && QUERY_FLAG (op, FLAG_APPLIED))
918 { 784 {
919 int cnt = MAX_ITEM_PER_DROP; 785 int cnt = MAX_ITEM_PER_DROP;
920 786
921 for (object *current = op->inv; current; ) 787 for (object *current = op->inv; current && cnt--; )
922 { 788 {
923 object *next = current->below; 789 object *next = current->below;
924
925 drop_object (pl, current, 0); 790 drop_object (pl, current, 0);
926
927 if (--cnt <= 0) break;
928
929 current = next; 791 current = next;
930 } 792 }
931 793
932 if (cnt <= 0) 794 if (cnt <= 0)
933 op->failmsg ("Only dropped some items, can't drop that many items at once."); 795 op->failmsg ("Only dropped some items, can't drop that many items at once.");
… …
946 pl->contr->count = nrof; 808 pl->contr->count = nrof;
947 pick_up (pl, op); 809 pick_up (pl, op);
948 return; 810 return;
949 } 811 }
950 812
951 env = esrv_get_ob_from_count (pl, to); 813 object *env = esrv_get_ob_from_count (pl, to);
952 if (!env) 814 if (!env)
953 { 815 {
954 LOG (llevDebug, "Player '%s' tried to move object to the unknown location (%d)\n", &pl->name, to); 816 LOG (llevDebug, "Player '%s' tried to move object to the unknown location (%d)\n", &pl->name, to);
955 return; 817 return;
956 } 818 }

Diff Legend

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