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.90 by root, Sat Apr 3 17:15:19 2010 UTC vs.
Revision 1.105 by root, Wed Nov 14 23:24:27 2018 UTC

1/* 1/*
2 * This file is part of Deliantra, the Roguelike Realtime MMORPG. 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (©) 2018 Marc Alexander Lehmann / the Deliantra team
4 * Copyright (©) 2005,2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 5 * Copyright (©) 2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2002 Mark Wedel & Crossfire Development Team 6 * Copyright (©) 2002 Mark Wedel & Crossfire Development Team
6 * Copyright (©) 1992 Frank Tore Johansen 7 * Copyright (©) 1992 Frank Tore Johansen
7 * 8 *
8 * Deliantra is free software: you can redistribute it and/or modify it under 9 * Deliantra is free software: you can redistribute it and/or modify it under
9 * the terms of the Affero GNU General Public License as published by the 10 * the terms of the Affero GNU General Public License as published by the
10 * Free Software Foundation, either version 3 of the License, or (at your 11 * Free Software Foundation, either version 3 of the License, or (at your
11 * option) any later version. 12 * option) any later version.
12 * 13 *
13 * This program is distributed in the hope that it will be useful, 14 * This program is distributed in the hope that it will be useful,
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of 15 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 16 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 * GNU General Public License for more details. 17 * GNU General Public License for more details.
17 * 18 *
18 * You should have received a copy of the Affero GNU General Public License 19 * You should have received a copy of the Affero GNU General Public License
19 * and the GNU General Public License along with this program. If not, see 20 * and the GNU General Public License along with this program. If not, see
20 * <http://www.gnu.org/licenses/>. 21 * <http://www.gnu.org/licenses/>.
21 * 22 *
22 * The authors can be reached via e-mail to <support@deliantra.net> 23 * The authors can be reached via e-mail to <support@deliantra.net>
23 */ 24 */
24 25
25/** 26/**
26 * \file 27 * \file
… …
46 * 47 *
47 ******************************************************************************/ 48 ******************************************************************************/
48 49
49/** 50/**
50 * This is a similar to query_name, but returns flags 51 * This is a similar to query_name, but returns flags
51 * to be sent to client. 52 * to be sent to client.
52 */ 53 */
53static unsigned int 54static unsigned int
54query_flags (object *op) 55query_flags (object *op)
55{ 56{
56 unsigned int flags = 0; 57 unsigned int flags = 0;
57 58
58 if (QUERY_FLAG (op, FLAG_APPLIED)) 59 if (op->flag [FLAG_APPLIED])
59 switch (op->type) 60 switch (op->type)
60 { 61 {
61 case BOW: 62 case BOW:
62 case WAND: 63 case WAND:
63 case ROD: 64 case ROD:
… …
89 } 90 }
90 91
91 if (op->is_open_container ()) 92 if (op->is_open_container ())
92 flags |= F_OPEN; 93 flags |= F_OPEN;
93 94
94 if (QUERY_FLAG (op, FLAG_KNOWN_CURSED)) 95 if (op->flag [FLAG_KNOWN_CURSED])
95 { 96 {
96 if (QUERY_FLAG (op, FLAG_DAMNED)) 97 if (op->flag [FLAG_DAMNED])
97 flags |= F_DAMNED; 98 flags |= F_DAMNED;
98 else if (QUERY_FLAG (op, FLAG_CURSED)) 99 else if (op->flag [FLAG_CURSED])
99 flags |= F_CURSED; 100 flags |= F_CURSED;
100 } 101 }
101 102
102 if (QUERY_FLAG (op, FLAG_KNOWN_MAGICAL) && !QUERY_FLAG (op, FLAG_IDENTIFIED)) 103 if (op->flag [FLAG_KNOWN_MAGICAL] && !op->flag [FLAG_IDENTIFIED])
103 flags |= F_MAGIC; 104 flags |= F_MAGIC;
104 if (QUERY_FLAG (op, FLAG_UNPAID)) 105 if (op->flag [FLAG_UNPAID])
105 flags |= F_UNPAID; 106 flags |= F_UNPAID;
106 if (QUERY_FLAG (op, FLAG_INV_LOCKED)) 107 if (op->flag [FLAG_INV_LOCKED])
107 flags |= F_LOCKED; 108 flags |= F_LOCKED;
108 109
109 return flags; 110 return flags;
110} 111}
111 112
… …
116static void 117static void
117add_object_to_socklist (client &ns, packet &sl, object *head) 118add_object_to_socklist (client &ns, packet &sl, object *head)
118{ 119{
119 int flags = query_flags (head); 120 int flags = query_flags (head);
120 121
121 if (QUERY_FLAG (head, FLAG_NO_PICK)) 122 if (head->flag [FLAG_NO_PICK])
122 flags |= F_NOPICK; 123 flags |= F_NOPICK;
123 124
124 ns.send_face (head->face, -50); 125 ns.send_face (head->face, -50);
125 ns.flush_fx ();
126 126
127 if (QUERY_FLAG (head, FLAG_ANIMATE) && !ns.anims_sent[head->animation_id]) 127 if (head->flag [FLAG_ANIMATE] && !ns.anims_sent[head->animation_id])
128 ns.send_animation (head->animation_id); 128 ns.send_animation (head->animation_id);
129 129
130 sl << uint32 (head->count) 130 sl << uint32 (head->count)
131 << uint32 (flags) 131 << uint32 (flags)
132 << uint32 (QUERY_FLAG (head, FLAG_NO_PICK) ? -1 : head->client_weight ()) 132 << uint32 (head->flag [FLAG_NO_PICK] ? -1 : head->client_weight ())
133 << uint32 (head->face); 133 << uint32 (head->face);
134 134
135 if (!head->custom_name) 135 if (!head->custom_name)
136 { 136 {
137 const char *name; 137 const char *name;
138 uint8 *len = sl.cur++; // patch up length later 138 uint8 *len = sl.cur++; // patch up length later
139 139
140 name = query_base_name (head, 0); sl << data (name, min (127, strlen (name))); 140 name = query_base_name (head, 0); sl << data_n (name, min (127, strlen (name)));
141 sl << uint8 (0); 141 sl << uint8 (0);
142 name = query_base_name (head, 1); sl << data (name, min (127, strlen (name))); 142 name = query_base_name (head, 1); sl << data_n (name, min (127, strlen (name)));
143 143
144 *len = sl.cur - len - 1; 144 *len = sl.cur - len - 1;
145 } 145 }
146 else 146 else
147 { 147 {
148 int len = min (head->custom_name.length (), 127); 148 int len = min (127, head->custom_name.length ());
149 149
150 sl << uint8 (len * 2 + 1) 150 sl << uint8 (len * 2 + 1)
151 << data (head->custom_name, len) 151 << data_n (head->custom_name, len)
152 << uint8 (0) 152 << uint8 (0)
153 << data (head->custom_name, len); 153 << data_n (head->custom_name, len);
154 } 154 }
155 155
156 sl << uint16 (head->animation_id); 156 sl << uint16 (head->animation_id);
157 157
158 int anim_speed = !head->flag [FLAG_ANIMATE] ? 0 158 int anim_speed = !head->flag [FLAG_ANIMATE] ? 0
… …
179 179
180#define FINGER_UP "finger_up.x11" 180#define FINGER_UP "finger_up.x11"
181#define FINGER_DOWN "finger_down.x11" 181#define FINGER_DOWN "finger_down.x11"
182 182
183/** 183/**
184 * Send the look window. Don't need to do animations here 184 * Send the look window. Don't need to do animations here
185 * This sends all the faces to the client, not just updates. This is 185 * This sends all the faces to the client, not just updates. This is
186 * because object ordering would otherwise be inconsistent. 186 * because object ordering would otherwise be inconsistent.
187 */ 187 */
188void 188void
189esrv_draw_look (player *pl) 189esrv_draw_look (player *pl)
… …
194 { 194 {
195 LOG (llevDebug, "esrv_draw_look called when update_look was not set (player %s)\n", &ob->name); 195 LOG (llevDebug, "esrv_draw_look called when update_look was not set (player %s)\n", &ob->name);
196 return; 196 return;
197 } 197 }
198 198
199 if (pl->ns->need_delinv0)
200 {
201 pl->ns->need_delinv0 = 0;
202 pl->ns->send_packet ("delinv 0");
203 }
204
205 if (pl->run_on)
206 return;
207
199 pl->ns->update_look = 0; 208 pl->ns->update_look = 0;
209 pl->ns->need_delinv0 = 1;
200 210
201 if (QUERY_FLAG (ob, FLAG_REMOVED) 211 if (ob->flag [FLAG_REMOVED]
202 || !ob->map 212 || !ob->map
203 || ob->map->in_memory != MAP_ACTIVE 213 || ob->map->state != MAP_ACTIVE
204 || out_of_map (ob->map, ob->x, ob->y)) 214 || out_of_map (ob->map, ob->x, ob->y))
205 return; 215 return;
206
207 pl->ns->send_packet ("delinv 0");
208 216
209 packet sl; 217 packet sl;
210 sl.printf ("item%d ", pl->ns->itemcmd); 218 sl.printf ("item%d ", pl->ns->itemcmd);
211 219
212 sl << uint32 (0); 220 sl << uint32 (0);
… …
279 dirty = true; 287 dirty = true;
280 288
281 // if packet got too large, send it and begin a new one 289 // if packet got too large, send it and begin a new one
282 if (sl.length () > MAXSOCKBUF - MAXITEMLEN) 290 if (sl.length () > MAXSOCKBUF - MAXITEMLEN)
283 { 291 {
292 pl->ns->flush_fx ();
284 pl->ns->send_packet (sl); 293 pl->ns->send_packet (sl);
285 294
286 sl.reset (); 295 sl.reset ();
287 sl.printf ("item%d ", pl->ns->itemcmd); 296 sl.printf ("item%d ", pl->ns->itemcmd);
288 sl << uint32 (0); 297 sl << uint32 (0);
… …
307 316
308 dirty = true; 317 dirty = true;
309 } 318 }
310 319
311 if (dirty) 320 if (dirty)
321 {
322 pl->ns->flush_fx ();
312 pl->ns->send_packet (sl); 323 pl->ns->send_packet (sl);
324 }
313} 325}
314 326
315/** 327/**
316 * Sends whole inventory. 328 * Sends whole inventory.
317 */ 329 */
… …
349 * items (especially with some of the bags out there) to 361 * items (especially with some of the bags out there) to
350 * overflow the buffer. IF so, send multiple item commands. 362 * overflow the buffer. IF so, send multiple item commands.
351 */ 363 */
352 if (sl.length () > MAXSOCKBUF - MAXITEMLEN) 364 if (sl.length () > MAXSOCKBUF - MAXITEMLEN)
353 { 365 {
366 pl->contr->ns->flush_fx ();
354 pl->contr->ns->send_packet (sl); 367 pl->contr->ns->send_packet (sl);
355 368
356 sl.reset (); 369 sl.reset ();
357 sl.printf ("item%d ", pl->contr->ns->itemcmd); 370 sl.printf ("item%d ", pl->contr->ns->itemcmd);
358 sl << uint32 (op->count); 371 sl << uint32 (op->count);
… …
360 } 373 }
361 } 374 }
362 } 375 }
363 376
364 if (got_one) 377 if (got_one)
378 {
379 pl->contr->ns->flush_fx ();
365 pl->contr->ns->send_packet (sl); 380 pl->contr->ns->send_packet (sl);
381 }
366} 382}
367 383
368/** 384/**
369 * Updates object *op for player *pl. 385 * Updates object *op for player *pl.
370 * 386 *
… …
441 457
442 if (flags & UPD_ANIMSPEED) 458 if (flags & UPD_ANIMSPEED)
443 { 459 {
444 int anim_speed = 0; 460 int anim_speed = 0;
445 461
446 if (QUERY_FLAG (op, FLAG_ANIMATE)) 462 if (op->flag [FLAG_ANIMATE])
447 { 463 {
448 if (op->anim_speed) 464 if (op->anim_speed)
449 anim_speed = op->anim_speed; 465 anim_speed = op->anim_speed;
450 else 466 else
451 { 467 {
… …
491 507
492 sl << uint32 (op->env ? op->env->count : 0); 508 sl << uint32 (op->env ? op->env->count : 0);
493 509
494 add_object_to_socklist (*pl->contr->ns, sl, op); 510 add_object_to_socklist (*pl->contr->ns, sl, op);
495 511
512 pl->contr->ns->flush_fx ();
496 pl->contr->ns->send_packet (sl); 513 pl->contr->ns->send_packet (sl);
497} 514}
498 515
499/** 516/**
500 * Tells the client to delete an item. 517 * Tells the client to delete an item.
… …
591 { 608 {
592 std::string s = op->describe (pl->ob); 609 std::string s = op->describe (pl->ob);
593 610
594 packet sl ("ex"); 611 packet sl ("ex");
595 sl << ber32 (tag) 612 sl << ber32 (tag)
596 << data (*pl->expand_cfpod (s.c_str ())); 613 << data_n (*pl->expand_cfpod (s.c_str ()));
597 614
598 pl->ns->send_packet (sl); 615 pl->ns->send_packet (sl);
599 } 616 }
600} 617}
601 618
… …
611 pl->ns->look_position = tag & 0x7fffffff; 628 pl->ns->look_position = tag & 0x7fffffff;
612 pl->ns->floorbox_update (); 629 pl->ns->floorbox_update ();
613 return; 630 return;
614 } 631 }
615 632
633 // the object might be legally gone already
616 object *op = esrv_get_ob_from_count (pl->ob, tag); 634 if (object *op = esrv_get_ob_from_count (pl->ob, tag))
617
618 if (!op)
619 {
620 LOG (llevDebug, "Player '%s' tried to apply the unknown object (%d)\n", &pl->ob->name, tag);
621 return;
622 }
623
624 pl->ob->apply (op, AP_TOGGLE); 635 pl->ob->apply (op, AP_TOGGLE);
625} 636}
626 637
627/** Client wants to lock some object. Lets do so. */ 638/** Client wants to lock some object. Lets do so. */
628void 639void
629LockItem (char *data, int len, player *pl) 640LockItem (char *data, int len, player *pl)
… …
632 tag_t tag = net_uint32 ((uint8 *)data + 1); 643 tag_t tag = net_uint32 ((uint8 *)data + 1);
633 object *op = esrv_get_ob_from_count (pl->ob, tag); 644 object *op = esrv_get_ob_from_count (pl->ob, tag);
634 645
635 if (!op) 646 if (!op)
636 { 647 {
637 pl->failmsg ("Could not find object to lock/unlock"); 648 pl->failmsgf ("Could not find object %d to lock/unlock", tag);
638 return; 649 return;
639 } 650 }
640 651
641 if (!flag) 652 if (!flag)
642 CLEAR_FLAG (op, FLAG_INV_LOCKED); 653 op->clr_flag (FLAG_INV_LOCKED);
643 else 654 else
644 SET_FLAG (op, FLAG_INV_LOCKED); 655 op->set_flag (FLAG_INV_LOCKED);
645 656
646 esrv_update_item (UPD_FLAGS, pl->ob, op); 657 esrv_update_item (UPD_FLAGS, pl->ob, op);
647} 658}
648 659
649/** Client wants to mark some object. Lets do so. */ 660/** Client wants to mark some object. Lets do so. */
… …
653 tag_t tag = net_uint32 ((uint8 *)data); 664 tag_t tag = net_uint32 ((uint8 *)data);
654 object *op = esrv_get_ob_from_count (pl->ob, tag); 665 object *op = esrv_get_ob_from_count (pl->ob, tag);
655 666
656 if (!op) 667 if (!op)
657 { 668 {
658 pl->failmsg ("Could not find object to mark"); 669 pl->failmsgf ("Could not find object %d to mark", tag);
659 return; 670 return;
660 } 671 }
661 672
662 pl->mark = op; 673 pl->mark = op;
663 pl->ob->statusmsg (format ("Marked item %s", query_name (op))); 674 pl->ob->statusmsg (format ("Marked item %s", query_name (op)));
… …
710 else 721 else
711 { 722 {
712 if (pos.normalise ()) 723 if (pos.normalise ())
713 for (object *tmp = pos->top; tmp; tmp = tmp->below) 724 for (object *tmp = pos->top; tmp; tmp = tmp->below)
714 { 725 {
715 if (tmp->invisible && !QUERY_FLAG (ob, FLAG_WIZ)) 726 if (tmp->invisible && !ob->flag [FLAG_WIZ])
716 continue; 727 continue;
717 728
718 if (wiz) 729 if (wiz)
719 buf.printf (" - %s (%d) %s\n", query_name (tmp), tmp->count, tmp->uuid.c_str ()); 730 buf.printf (" - %s (%d) %s\n", query_name (tmp), tmp->count, tmp->uuid.c_str ());
720 else 731 else
… …
722 733
723 object *head = tmp->head_ (); 734 object *head = tmp->head_ ();
724 735
725 if (head->inv) 736 if (head->inv)
726 if ((head->type != CONTAINER && head->type != FLESH) 737 if ((head->type != CONTAINER && head->type != FLESH)
727 || QUERY_FLAG (ob, FLAG_WIZ)) 738 || ob->flag [FLAG_WIZ])
728 buf << head->query_inventory (ob, " "); 739 buf << head->query_inventory (ob, " ");
729 740
730 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) && !wiz) /* don't continue under the floor */ 741 if (tmp->flag [FLAG_IS_FLOOR] && !wiz) /* don't continue under the floor */
731 break; 742 break;
732 } 743 }
733 } 744 }
734 745
735 if (buf.empty ()) 746 if (buf.empty ())
… …
770 return; 781 return;
771 782
772 /* If it is an active container, then we should drop all objects 783 /* If it is an active container, then we should drop all objects
773 * in the container and not the container itself. 784 * in the container and not the container itself.
774 */ 785 */
775 if (op->inv && QUERY_FLAG (op, FLAG_APPLIED)) 786 if (op->inv && op->flag [FLAG_APPLIED])
776 { 787 {
777 int cnt = MAX_ITEM_PER_ACTION; 788 int cnt = MAX_ITEM_PER_ACTION;
778 789
779 for (object *current = op->inv; current && cnt--; ) 790 for (object *current = op->inv; current && cnt--; )
780 { 791 {

Diff Legend

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