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.91 by root, Thu Apr 8 04:49:02 2010 UTC vs.
Revision 1.97 by root, Wed May 4 07:41:14 2011 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 (©) 2005,2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4 * Copyright (©) 2005,2006,2007,2008,2009,2010,2011 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2002 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002 Mark Wedel & Crossfire Development Team
6 * Copyright (©) 1992 Frank Tore Johansen 6 * Copyright (©) 1992 Frank Tore Johansen
7 * 7 *
8 * Deliantra is free software: you can redistribute it and/or modify it under 8 * 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 9 * the terms of the Affero GNU General Public License as published by the
… …
53static unsigned int 53static unsigned int
54query_flags (object *op) 54query_flags (object *op)
55{ 55{
56 unsigned int flags = 0; 56 unsigned int flags = 0;
57 57
58 if (QUERY_FLAG (op, FLAG_APPLIED)) 58 if (op->flag [FLAG_APPLIED])
59 switch (op->type) 59 switch (op->type)
60 { 60 {
61 case BOW: 61 case BOW:
62 case WAND: 62 case WAND:
63 case ROD: 63 case ROD:
… …
89 } 89 }
90 90
91 if (op->is_open_container ()) 91 if (op->is_open_container ())
92 flags |= F_OPEN; 92 flags |= F_OPEN;
93 93
94 if (QUERY_FLAG (op, FLAG_KNOWN_CURSED)) 94 if (op->flag [FLAG_KNOWN_CURSED])
95 { 95 {
96 if (QUERY_FLAG (op, FLAG_DAMNED)) 96 if (op->flag [FLAG_DAMNED])
97 flags |= F_DAMNED; 97 flags |= F_DAMNED;
98 else if (QUERY_FLAG (op, FLAG_CURSED)) 98 else if (op->flag [FLAG_CURSED])
99 flags |= F_CURSED; 99 flags |= F_CURSED;
100 } 100 }
101 101
102 if (QUERY_FLAG (op, FLAG_KNOWN_MAGICAL) && !QUERY_FLAG (op, FLAG_IDENTIFIED)) 102 if (op->flag [FLAG_KNOWN_MAGICAL] && !op->flag [FLAG_IDENTIFIED])
103 flags |= F_MAGIC; 103 flags |= F_MAGIC;
104 if (QUERY_FLAG (op, FLAG_UNPAID)) 104 if (op->flag [FLAG_UNPAID])
105 flags |= F_UNPAID; 105 flags |= F_UNPAID;
106 if (QUERY_FLAG (op, FLAG_INV_LOCKED)) 106 if (op->flag [FLAG_INV_LOCKED])
107 flags |= F_LOCKED; 107 flags |= F_LOCKED;
108 108
109 return flags; 109 return flags;
110} 110}
111 111
… …
116static void 116static void
117add_object_to_socklist (client &ns, packet &sl, object *head) 117add_object_to_socklist (client &ns, packet &sl, object *head)
118{ 118{
119 int flags = query_flags (head); 119 int flags = query_flags (head);
120 120
121 if (QUERY_FLAG (head, FLAG_NO_PICK)) 121 if (head->flag [FLAG_NO_PICK])
122 flags |= F_NOPICK; 122 flags |= F_NOPICK;
123 123
124 ns.send_face (head->face, -50); 124 ns.send_face (head->face, -50);
125 125
126 if (QUERY_FLAG (head, FLAG_ANIMATE) && !ns.anims_sent[head->animation_id]) 126 if (head->flag [FLAG_ANIMATE] && !ns.anims_sent[head->animation_id])
127 ns.send_animation (head->animation_id); 127 ns.send_animation (head->animation_id);
128 128
129 sl << uint32 (head->count) 129 sl << uint32 (head->count)
130 << uint32 (flags) 130 << uint32 (flags)
131 << uint32 (QUERY_FLAG (head, FLAG_NO_PICK) ? -1 : head->client_weight ()) 131 << uint32 (head->flag [FLAG_NO_PICK] ? -1 : head->client_weight ())
132 << uint32 (head->face); 132 << uint32 (head->face);
133 133
134 if (!head->custom_name) 134 if (!head->custom_name)
135 { 135 {
136 const char *name; 136 const char *name;
… …
193 { 193 {
194 LOG (llevDebug, "esrv_draw_look called when update_look was not set (player %s)\n", &ob->name); 194 LOG (llevDebug, "esrv_draw_look called when update_look was not set (player %s)\n", &ob->name);
195 return; 195 return;
196 } 196 }
197 197
198 if (pl->ns->need_delinv0)
199 {
200 pl->ns->need_delinv0 = 0;
201 pl->ns->send_packet ("delinv 0");
202 }
203
204 if (pl->run_on)
205 return;
206
198 pl->ns->update_look = 0; 207 pl->ns->update_look = 0;
208 pl->ns->need_delinv0 = 1;
199 209
200 if (QUERY_FLAG (ob, FLAG_REMOVED) 210 if (ob->flag [FLAG_REMOVED]
201 || !ob->map 211 || !ob->map
202 || ob->map->in_memory != MAP_ACTIVE 212 || ob->map->state != MAP_ACTIVE
203 || out_of_map (ob->map, ob->x, ob->y)) 213 || out_of_map (ob->map, ob->x, ob->y))
204 return; 214 return;
205
206 pl->ns->send_packet ("delinv 0");
207 215
208 packet sl; 216 packet sl;
209 sl.printf ("item%d ", pl->ns->itemcmd); 217 sl.printf ("item%d ", pl->ns->itemcmd);
210 218
211 sl << uint32 (0); 219 sl << uint32 (0);
… …
448 456
449 if (flags & UPD_ANIMSPEED) 457 if (flags & UPD_ANIMSPEED)
450 { 458 {
451 int anim_speed = 0; 459 int anim_speed = 0;
452 460
453 if (QUERY_FLAG (op, FLAG_ANIMATE)) 461 if (op->flag [FLAG_ANIMATE])
454 { 462 {
455 if (op->anim_speed) 463 if (op->anim_speed)
456 anim_speed = op->anim_speed; 464 anim_speed = op->anim_speed;
457 else 465 else
458 { 466 {
… …
619 pl->ns->look_position = tag & 0x7fffffff; 627 pl->ns->look_position = tag & 0x7fffffff;
620 pl->ns->floorbox_update (); 628 pl->ns->floorbox_update ();
621 return; 629 return;
622 } 630 }
623 631
632 // the object might be legally gone already
624 object *op = esrv_get_ob_from_count (pl->ob, tag); 633 if (object *op = esrv_get_ob_from_count (pl->ob, tag))
625
626 if (!op)
627 {
628 LOG (llevDebug, "Player '%s' tried to apply the unknown object (%d)\n", &pl->ob->name, tag);
629 return;
630 }
631
632 pl->ob->apply (op, AP_TOGGLE); 634 pl->ob->apply (op, AP_TOGGLE);
633} 635}
634 636
635/** Client wants to lock some object. Lets do so. */ 637/** Client wants to lock some object. Lets do so. */
636void 638void
637LockItem (char *data, int len, player *pl) 639LockItem (char *data, int len, player *pl)
… …
645 pl->failmsg ("Could not find object to lock/unlock"); 647 pl->failmsg ("Could not find object to lock/unlock");
646 return; 648 return;
647 } 649 }
648 650
649 if (!flag) 651 if (!flag)
650 CLEAR_FLAG (op, FLAG_INV_LOCKED); 652 op->clr_flag (FLAG_INV_LOCKED);
651 else 653 else
652 SET_FLAG (op, FLAG_INV_LOCKED); 654 op->set_flag (FLAG_INV_LOCKED);
653 655
654 esrv_update_item (UPD_FLAGS, pl->ob, op); 656 esrv_update_item (UPD_FLAGS, pl->ob, op);
655} 657}
656 658
657/** Client wants to mark some object. Lets do so. */ 659/** Client wants to mark some object. Lets do so. */
… …
718 else 720 else
719 { 721 {
720 if (pos.normalise ()) 722 if (pos.normalise ())
721 for (object *tmp = pos->top; tmp; tmp = tmp->below) 723 for (object *tmp = pos->top; tmp; tmp = tmp->below)
722 { 724 {
723 if (tmp->invisible && !QUERY_FLAG (ob, FLAG_WIZ)) 725 if (tmp->invisible && !ob->flag [FLAG_WIZ])
724 continue; 726 continue;
725 727
726 if (wiz) 728 if (wiz)
727 buf.printf (" - %s (%d) %s\n", query_name (tmp), tmp->count, tmp->uuid.c_str ()); 729 buf.printf (" - %s (%d) %s\n", query_name (tmp), tmp->count, tmp->uuid.c_str ());
728 else 730 else
… …
730 732
731 object *head = tmp->head_ (); 733 object *head = tmp->head_ ();
732 734
733 if (head->inv) 735 if (head->inv)
734 if ((head->type != CONTAINER && head->type != FLESH) 736 if ((head->type != CONTAINER && head->type != FLESH)
735 || QUERY_FLAG (ob, FLAG_WIZ)) 737 || ob->flag [FLAG_WIZ])
736 buf << head->query_inventory (ob, " "); 738 buf << head->query_inventory (ob, " ");
737 739
738 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) && !wiz) /* don't continue under the floor */ 740 if (tmp->flag [FLAG_IS_FLOOR] && !wiz) /* don't continue under the floor */
739 break; 741 break;
740 } 742 }
741 } 743 }
742 744
743 if (buf.empty ()) 745 if (buf.empty ())
… …
778 return; 780 return;
779 781
780 /* If it is an active container, then we should drop all objects 782 /* If it is an active container, then we should drop all objects
781 * in the container and not the container itself. 783 * in the container and not the container itself.
782 */ 784 */
783 if (op->inv && QUERY_FLAG (op, FLAG_APPLIED)) 785 if (op->inv && op->flag [FLAG_APPLIED])
784 { 786 {
785 int cnt = MAX_ITEM_PER_ACTION; 787 int cnt = MAX_ITEM_PER_ACTION;
786 788
787 for (object *current = op->inv; current && cnt--; ) 789 for (object *current = op->inv; current && cnt--; )
788 { 790 {

Diff Legend

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