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.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 *
… …
304 sl << uint8 (anim_speed) 165 sl << uint8 (anim_speed)
305 << uint32 (head->nrof); 166 << uint32 (head->nrof);
306 167
307 if (ns.itemcmd == 2) 168 if (ns.itemcmd == 2)
308 sl << uint16 (head->client_type); 169 sl << uint16 (head->client_type);
309
310 SET_FLAG (head, FLAG_CLIENT_SENT);
311} 170}
312 171
313static faceidx 172static faceidx
314need_face_now (player *pl, const char *name) 173need_face_now (player *pl, const char *name)
315{ 174{
… …
525 384
526 client *ns = pl->contr->ns; 385 client *ns = pl->contr->ns;
527 if (!ns) 386 if (!ns)
528 return; 387 return;
529 388
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"); 389 packet sl ("upditem");
540 390
541 sl << uint8 (flags); 391 sl << uint8 (flags);
542 392
543 op = op->head_ (); 393 op = op->head_ ();
… …
550 if (flags & UPD_FLAGS) 400 if (flags & UPD_FLAGS)
551 sl << uint32 (query_flags (op)); 401 sl << uint32 (query_flags (op));
552 402
553 if (flags & UPD_WEIGHT) 403 if (flags & UPD_WEIGHT)
554 { 404 {
555 sint32 weight = op->flag [FLAG_NO_PICK] ? -1 : op->client_weight (); 405 sint32 weight = op->client_weight ();
556 406
557 if (op) 407 if (op == pl)
558 ns->last_weight = weight; 408 ns->last_weight = weight;
559 409
560 sl << uint32 (weight); 410 sl << uint32 (weight);
561 } 411 }
562 412
… …
569 419
570 if (flags & UPD_NAME) 420 if (flags & UPD_NAME)
571 { 421 {
572 int len; 422 int len;
573 const char *item_p; 423 const char *item_p;
574 char item_n[MAX_BUF]; 424 char item_n[127 * 2];
575 425
576 if (!op->custom_name) 426 if (!op->custom_name)
577 { 427 {
578 strncpy (item_n, query_base_name (op, 0), 127); 428 len = assign (item_n, query_base_name (op, 0), 127);
579 item_n[127] = 0;
580 len = strlen (item_n);
581 item_p = query_base_name (op, 1); 429 item_p = query_base_name (op, 1);
582 } 430 }
583 else 431 else
584 { 432 {
585 strncpy (item_n, op->custom_name, 127); 433 len = assign (item_n, &op->custom_name, 127);
586 item_n[127] = 0;
587 len = strlen (item_n);
588 item_p = op->custom_name; 434 item_p = &op->custom_name;
589 } 435 }
590 436
591 strncpy (item_n + len + 1, item_p, 127); 437 len += assign (item_n + len, item_p, 127);
592 item_n[254] = 0;
593 len += strlen (item_n + 1 + len) + 1;
594 438
595 sl << data8 (item_n, len); 439 sl << data8 (item_n, len);
596 } 440 }
597 441
598 if (flags & UPD_ANIM) 442 if (flags & UPD_ANIM)
… …
651 sl << uint32 (op->env ? op->env->count : 0); 495 sl << uint32 (op->env ? op->env->count : 0);
652 496
653 add_object_to_socklist (*pl->contr->ns, sl, op); 497 add_object_to_socklist (*pl->contr->ns, sl, op);
654 498
655 pl->contr->ns->send_packet (sl); 499 pl->contr->ns->send_packet (sl);
656 SET_FLAG (op, FLAG_CLIENT_SENT);
657} 500}
658 501
659/** 502/**
660 * Tells the client to delete an item. 503 * Tells the client to delete an item.
661 */ 504 */
… …
750 if (object *op = esrv_get_ob_from_count (pl->ob, tag)) 593 if (object *op = esrv_get_ob_from_count (pl->ob, tag))
751 { 594 {
752 std::string s = op->describe (pl->ob); 595 std::string s = op->describe (pl->ob);
753 596
754 packet sl ("ex"); 597 packet sl ("ex");
755 sl << ber32 (tag) << s.c_str (); 598 sl << ber32 (tag)
599 << data (*pl->expand_cfpod (s.c_str ()));
756 600
757 pl->ns->send_packet (sl); 601 pl->ns->send_packet (sl);
758 } 602 }
759} 603}
760 604
… …
829 * Tero.Haatanen@lut.fi ] 673 * Tero.Haatanen@lut.fi ]
830 */ 674 */
831static void 675static void
832look_at (player *pl, int dx, int dy) 676look_at (player *pl, int dx, int dy)
833{ 677{
834 dynbuf_text buf; 678 dynbuf_text &buf = msg_dynbuf; buf.clear ();
835 object *ob = pl->ob; 679 object *ob = pl->ob;
836 680
837 if (!pl->observe->map) 681 if (!pl->observe->map)
838 return; 682 return;
839 683
684 bool wiz = ob->flag [FLAG_WIZ] || ob->flag [FLAG_WIZLOOK];
685
840 mapxy pos (pl->observe); 686 mapxy pos (pl->observe);
841 pos.move (dx, dy); 687 pos.move (dx, dy);
842 688
689 if (wiz)
690 {
843 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 ())
844 for (object *tmp = pos->top; tmp; tmp = tmp->below) 716 for (object *tmp = pos->top; tmp; tmp = tmp->below)
845 { 717 {
846 if (tmp->invisible && !QUERY_FLAG (ob, FLAG_WIZ)) 718 if (tmp->invisible && !QUERY_FLAG (ob, FLAG_WIZ))
847 continue; 719 continue;
848 720
849 if (QUERY_FLAG (ob, FLAG_WIZ)) 721 if (wiz)
850 buf.printf ("- %s (%d).\n", query_name (tmp), tmp->count); 722 buf.printf (" - %s (%d).\n", query_name (tmp), tmp->count);
851 else 723 else
852 buf.printf ("- %s.\n", query_name (tmp)); 724 buf.printf (" - %s.\n", query_name (tmp));
853 725
854 object *head = tmp->head_ (); 726 object *head = tmp->head_ ();
855 727
856 if (head->inv) 728 if (head->inv)
857 if ((head->type != CONTAINER && head->type != FLESH) 729 if ((head->type != CONTAINER && head->type != FLESH)
858 || QUERY_FLAG (ob, FLAG_WIZ)) 730 || QUERY_FLAG (ob, FLAG_WIZ))
859 buf << head->query_inventory (ob, " "); 731 buf << head->query_inventory (ob, " ");
860 732
861 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 */
862 break; 734 break;
735 }
863 } 736 }
864 737
865 if (buf.empty ()) 738 if (buf.empty ())
866 pl->failmsg ("You see nothing there."); 739 buf << "You see nothing there.";
867 else 740
868 pl->infobox (MSG_CHANNEL ("lookat"), buf); 741 pl->infobox (MSG_CHANNEL ("lookat"), buf);
869} 742}
870 743
871/** Client wants to look at some object. Lets do so. */ 744/** Client wants to look at some object. Lets do so. */
872void 745void
873LookAt (char *buf, int len, player *pl) 746LookAt (char *buf, int len, player *pl)
… …
878 if (!(cp = strchr (buf, ' '))) 751 if (!(cp = strchr (buf, ' ')))
879 return; 752 return;
880 753
881 int dy = atoi (cp); 754 int dy = atoi (cp);
882 755
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); 756 look_at (pl, dx, dy);
894} 757}
895 758
896/** Move an object to a new location */ 759/** Move an object to a new location */
897void 760void
898esrv_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)
899{ 762{
900 object *op, *env;
901
902 op = esrv_get_ob_from_count (pl, tag); 763 object *op = esrv_get_ob_from_count (pl, tag);
903 if (!op) 764 if (!op)
904 { 765 {
905 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);
906 return; 767 return;
907 } 768 }
… …
916 */ 777 */
917 if (op->inv && QUERY_FLAG (op, FLAG_APPLIED)) 778 if (op->inv && QUERY_FLAG (op, FLAG_APPLIED))
918 { 779 {
919 int cnt = MAX_ITEM_PER_DROP; 780 int cnt = MAX_ITEM_PER_DROP;
920 781
921 for (object *current = op->inv; current; ) 782 for (object *current = op->inv; current && cnt--; )
922 { 783 {
923 object *next = current->below; 784 object *next = current->below;
924
925 drop_object (pl, current, 0); 785 drop_object (pl, current, 0);
926
927 if (--cnt <= 0) break;
928
929 current = next; 786 current = next;
930 } 787 }
931 788
932 if (cnt <= 0) 789 if (cnt <= 0)
933 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.");
… …
946 pl->contr->count = nrof; 803 pl->contr->count = nrof;
947 pick_up (pl, op); 804 pick_up (pl, op);
948 return; 805 return;
949 } 806 }
950 807
951 env = esrv_get_ob_from_count (pl, to); 808 object *env = esrv_get_ob_from_count (pl, to);
952 if (!env) 809 if (!env)
953 { 810 {
954 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);
955 return; 812 return;
956 } 813 }

Diff Legend

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