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.79 by root, Mon Oct 12 14:00:59 2009 UTC

… …
3 * 3 *
4 * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4 * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
6 * Copyright (©) 1992,2007 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
7 * 7 *
8 * Deliantra is free software: you can redistribute it and/or modify 8 * Deliantra is free software: you can redistribute it and/or modify it under
9 * it under the terms of the GNU General Public License as published by 9 * the terms of the Affero GNU General Public License as published by the
10 * the Free Software Foundation, either version 3 of the License, or 10 * Free Software Foundation, either version 3 of the License, or (at your
11 * (at your option) any later version. 11 * option) any later version.
12 * 12 *
13 * This program is distributed in the hope that it will be useful, 13 * This program is distributed in the hope that it will be useful,
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 * GNU General Public License for more details. 16 * GNU General Public License for more details.
17 * 17 *
18 * You should have received a copy of the GNU General Public License 18 * You should have received a copy of the Affero GNU General Public License
19 * along with this program. If not, see <http://www.gnu.org/licenses/>. 19 * and the GNU General Public License along with this program. If not, see
20 * <http://www.gnu.org/licenses/>.
20 * 21 *
21 * The authors can be reached via e-mail to <support@deliantra.net> 22 * The authors can be reached via e-mail to <support@deliantra.net>
22 */ 23 */
23 24
24/** 25/**
… …
36#include <object.h> 37#include <object.h>
37#include <sproto.h> 38#include <sproto.h>
38 39
39/** This is the maximum number of bytes we expect any one item to take up */ 40/** This is the maximum number of bytes we expect any one item to take up */
40#define MAXITEMLEN 300 41#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 42
182/******************************************************************************* 43/*******************************************************************************
183 * 44 *
184 * Functions related to sending object data to the client. 45 * Functions related to sending object data to the client.
185 * 46 *
… …
253 * animation of face to the client. 114 * animation of face to the client.
254 */ 115 */
255static void 116static void
256add_object_to_socklist (client &ns, packet &sl, object *head) 117add_object_to_socklist (client &ns, packet &sl, object *head)
257{ 118{
258 int flags, len, anim_speed;
259 char item_n[MAX_BUF]; 119 char item_n[MAX_BUF];
260 const char *item_p; 120 const char *item_p;
261 121
262 flags = query_flags (head); 122 int flags = query_flags (head);
263 if (QUERY_FLAG (head, FLAG_NO_PICK)) 123 if (QUERY_FLAG (head, FLAG_NO_PICK))
264 flags |= F_NOPICK; 124 flags |= F_NOPICK;
265 125
266 ns.send_face (head->face, -50); 126 ns.send_face (head->face, -50);
267 ns.flush_fx (); 127 ns.flush_fx ();
… …
272 sl << uint32 (head->count) 132 sl << uint32 (head->count)
273 << uint32 (flags) 133 << uint32 (flags)
274 << uint32 (QUERY_FLAG (head, FLAG_NO_PICK) ? -1 : head->client_weight ()) 134 << uint32 (QUERY_FLAG (head, FLAG_NO_PICK) ? -1 : head->client_weight ())
275 << uint32 (head->face); 135 << uint32 (head->face);
276 136
137 int len;
138
277 if (!head->custom_name) 139 if (!head->custom_name)
278 { 140 {
279 strncpy (item_n, query_base_name (head, 0), 127); 141 strncpy (item_n, query_base_name (head, 0), 127);
280 item_n[127] = 0; 142 item_n[127] = 0;
281 len = strlen (item_n); 143 len = strlen (item_n);
… …
294 len += strlen (item_n + 1 + len) + 1; 156 len += strlen (item_n + 1 + len) + 1;
295 157
296 sl << data8 (item_n, len) 158 sl << data8 (item_n, len)
297 << uint16 (head->animation_id); 159 << uint16 (head->animation_id);
298 160
299 anim_speed = 0; 161 int anim_speed = !head->flag [FLAG_ANIMATE] ? 0
300 if (QUERY_FLAG (head, FLAG_ANIMATE)) 162 : head->anim_speed ? clamp (head->anim_speed, 1, 255)
301 { 163 : 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 164
318 sl << uint8 (anim_speed) 165 sl << uint8 (anim_speed)
319 << uint32 (head->nrof); 166 << uint32 (head->nrof);
320 167
321 if (ns.itemcmd == 2) 168 if (ns.itemcmd == 2)
322 sl << uint16 (head->client_type); 169 sl << uint16 (head->client_type);
323
324 SET_FLAG (head, FLAG_CLIENT_SENT);
325} 170}
326 171
327static faceidx 172static faceidx
328need_face_now (player *pl, const char *name) 173need_face_now (player *pl, const char *name)
329{ 174{
… …
539 384
540 client *ns = pl->contr->ns; 385 client *ns = pl->contr->ns;
541 if (!ns) 386 if (!ns)
542 return; 387 return;
543 388
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"); 389 packet sl ("upditem");
554 390
555 sl << uint8 (flags); 391 sl << uint8 (flags);
556 392
557 op = op->head_ (); 393 op = op->head_ ();
… …
564 if (flags & UPD_FLAGS) 400 if (flags & UPD_FLAGS)
565 sl << uint32 (query_flags (op)); 401 sl << uint32 (query_flags (op));
566 402
567 if (flags & UPD_WEIGHT) 403 if (flags & UPD_WEIGHT)
568 { 404 {
569 sint32 weight = op->flag [FLAG_NO_PICK] ? -1 : op->client_weight (); 405 sint32 weight = op->client_weight ();
570 406
571 if (op) 407 if (op == pl)
572 ns->last_weight = weight; 408 ns->last_weight = weight;
573 409
574 sl << uint32 (weight); 410 sl << uint32 (weight);
575 } 411 }
576 412
… …
583 419
584 if (flags & UPD_NAME) 420 if (flags & UPD_NAME)
585 { 421 {
586 int len; 422 int len;
587 const char *item_p; 423 const char *item_p;
588 char item_n[MAX_BUF]; 424 char item_n[127 * 2];
589 425
590 if (!op->custom_name) 426 if (!op->custom_name)
591 { 427 {
592 strncpy (item_n, query_base_name (op, 0), 127); 428 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); 429 item_p = query_base_name (op, 1);
596 } 430 }
597 else 431 else
598 { 432 {
599 strncpy (item_n, op->custom_name, 127); 433 len = assign (item_n, &op->custom_name, 127);
600 item_n[127] = 0;
601 len = strlen (item_n);
602 item_p = op->custom_name; 434 item_p = &op->custom_name;
603 } 435 }
604 436
605 strncpy (item_n + len + 1, item_p, 127); 437 len += assign (item_n + len, item_p, 127);
606 item_n[254] = 0;
607 len += strlen (item_n + 1 + len) + 1;
608 438
609 sl << data8 (item_n, len); 439 sl << data8 (item_n, len);
610 } 440 }
611 441
612 if (flags & UPD_ANIM) 442 if (flags & UPD_ANIM)
… …
665 sl << uint32 (op->env ? op->env->count : 0); 495 sl << uint32 (op->env ? op->env->count : 0);
666 496
667 add_object_to_socklist (*pl->contr->ns, sl, op); 497 add_object_to_socklist (*pl->contr->ns, sl, op);
668 498
669 pl->contr->ns->send_packet (sl); 499 pl->contr->ns->send_packet (sl);
670 SET_FLAG (op, FLAG_CLIENT_SENT);
671} 500}
672 501
673/** 502/**
674 * Tells the client to delete an item. 503 * Tells the client to delete an item.
675 */ 504 */
… …
764 if (object *op = esrv_get_ob_from_count (pl->ob, tag)) 593 if (object *op = esrv_get_ob_from_count (pl->ob, tag))
765 { 594 {
766 std::string s = op->describe (pl->ob); 595 std::string s = op->describe (pl->ob);
767 596
768 packet sl ("ex"); 597 packet sl ("ex");
769 sl << ber32 (tag) << s.c_str (); 598 sl << ber32 (tag)
599 << data (*pl->expand_cfpod (s.c_str ()));
770 600
771 pl->ns->send_packet (sl); 601 pl->ns->send_packet (sl);
772 } 602 }
773} 603}
774 604
… …
843 * Tero.Haatanen@lut.fi ] 673 * Tero.Haatanen@lut.fi ]
844 */ 674 */
845static void 675static void
846look_at (player *pl, int dx, int dy) 676look_at (player *pl, int dx, int dy)
847{ 677{
848 dynbuf_text buf; 678 dynbuf_text &buf = msg_dynbuf; buf.clear ();
849 object *ob = pl->ob; 679 object *ob = pl->ob;
850 680
851 if (!pl->observe->map) 681 if (!pl->observe->map)
852 return; 682 return;
853 683
684 bool wiz = ob->flag [FLAG_WIZ] || ob->flag [FLAG_WIZLOOK];
685
854 mapxy pos (pl->observe); 686 mapxy pos (pl->observe);
855 pos.move (dx, dy); 687 pos.move (dx, dy);
856 688
689 if (wiz)
690 {
857 if (pos.normalise ()) 691 if (pos.normalise ())
692 {
693 mapspace &ms = *pos;
694 ms.update ();
695
696 buf.printf (" map: %s%+d%+d (%+d%+d)\n"
697 " smell %u/%u; flags %x; light %d; block %x; slow %x; on %x; off %x; volume %lld\n\n",
698 &pos.m->path, pos.x, pos.y, dx, dy,
699 (unsigned int)ms.smell, (unsigned int)mapspace::smellcount, ms.flags (), ms.light,
700 ms.move_block, ms.move_slow, ms.move_on, ms.move_off, (long long)ms.volume ()
701 );
702 }
703 else
704 buf << "off-map\n\n";
705 }
706
707 int darkness = pl->blocked_los (dx, dy);
708
709 if (darkness == LOS_BLOCKED)
710 buf << "You cannot see that place from your position. H<Something is in between or it is too far away.>";
711 else if (darkness == LOS_MAX)
712 buf << "That place is too dark to see anything. H<Move nearer or find better lighting.>";
713 else
714 {
715 if (pos.normalise ())
858 for (object *tmp = pos->top; tmp; tmp = tmp->below) 716 for (object *tmp = pos->top; tmp; tmp = tmp->below)
859 { 717 {
860 if (tmp->invisible && !QUERY_FLAG (ob, FLAG_WIZ)) 718 if (tmp->invisible && !QUERY_FLAG (ob, FLAG_WIZ))
861 continue; 719 continue;
862 720
863 if (QUERY_FLAG (ob, FLAG_WIZ)) 721 if (wiz)
864 buf.printf ("- %s (%d).\n", query_name (tmp), tmp->count); 722 buf.printf (" - %s (%d).\n", query_name (tmp), tmp->count);
865 else 723 else
866 buf.printf ("- %s.\n", query_name (tmp)); 724 buf.printf (" - %s.\n", query_name (tmp));
867 725
868 object *head = tmp->head_ (); 726 object *head = tmp->head_ ();
869 727
870 if (head->inv) 728 if (head->inv)
871 if ((head->type != CONTAINER && head->type != FLESH) 729 if ((head->type != CONTAINER && head->type != FLESH)
872 || QUERY_FLAG (ob, FLAG_WIZ)) 730 || QUERY_FLAG (ob, FLAG_WIZ))
873 buf << head->query_inventory (ob, " "); 731 buf << head->query_inventory (ob, " ");
874 732
875 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) && !QUERY_FLAG (ob, FLAG_WIZ)) /* don't continue under the floor */ 733 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) && !wiz) /* don't continue under the floor */
876 break; 734 break;
735 }
877 } 736 }
878 737
879 if (buf.empty ()) 738 if (buf.empty ())
880 pl->failmsg ("You see nothing there."); 739 buf << "You see nothing there.";
881 else 740
882 pl->infobox (MSG_CHANNEL ("lookat"), buf); 741 pl->infobox (MSG_CHANNEL ("lookat"), buf);
883} 742}
884 743
885/** Client wants to look at some object. Lets do so. */ 744/** Client wants to look at some object. Lets do so. */
886void 745void
887LookAt (char *buf, int len, player *pl) 746LookAt (char *buf, int len, player *pl)
… …
892 if (!(cp = strchr (buf, ' '))) 751 if (!(cp = strchr (buf, ' ')))
893 return; 752 return;
894 753
895 int dy = atoi (cp); 754 int dy = atoi (cp);
896 755
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); 756 look_at (pl, dx, dy);
908} 757}
909 758
910/** Move an object to a new location */ 759/** Move an object to a new location */
911void 760void
912esrv_move_object (object *pl, tag_t to, tag_t tag, long nrof) 761esrv_move_object (object *pl, tag_t to, tag_t tag, long nrof)
913{ 762{
914 object *op, *env;
915
916 op = esrv_get_ob_from_count (pl, tag); 763 object *op = esrv_get_ob_from_count (pl, tag);
917 if (!op) 764 if (!op)
918 { 765 {
919 LOG (llevDebug, "Player '%s' tried to move an unknown object (%ld)\n", &pl->name, tag); 766 LOG (llevDebug, "Player '%s' tried to move an unknown object (%ld)\n", &pl->name, tag);
920 return; 767 return;
921 } 768 }
… …
930 */ 777 */
931 if (op->inv && QUERY_FLAG (op, FLAG_APPLIED)) 778 if (op->inv && QUERY_FLAG (op, FLAG_APPLIED))
932 { 779 {
933 int cnt = MAX_ITEM_PER_DROP; 780 int cnt = MAX_ITEM_PER_DROP;
934 781
935 for (object *current = op->inv; current; ) 782 for (object *current = op->inv; current && cnt--; )
936 { 783 {
937 object *next = current->below; 784 object *next = current->below;
938
939 drop_object (pl, current, 0); 785 drop_object (pl, current, 0);
940
941 if (--cnt <= 0) break;
942
943 current = next; 786 current = next;
944 } 787 }
945 788
946 if (cnt <= 0) 789 if (cnt <= 0)
947 op->failmsg ("Only dropped some items, can't drop that many items at once."); 790 op->failmsg ("Only dropped some items, can't drop that many items at once.");
… …
960 pl->contr->count = nrof; 803 pl->contr->count = nrof;
961 pick_up (pl, op); 804 pick_up (pl, op);
962 return; 805 return;
963 } 806 }
964 807
965 env = esrv_get_ob_from_count (pl, to); 808 object *env = esrv_get_ob_from_count (pl, to);
966 if (!env) 809 if (!env)
967 { 810 {
968 LOG (llevDebug, "Player '%s' tried to move object to the unknown location (%d)\n", &pl->name, to); 811 LOG (llevDebug, "Player '%s' tried to move object to the unknown location (%d)\n", &pl->name, to);
969 return; 812 return;
970 } 813 }

Diff Legend

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