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.93 by root, Sun Apr 11 23:32:10 2010 UTC

… …
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 pl->ns->send_packet ("delinv 0");
199
200 if (pl->run_on)
201 return;
202
198 pl->ns->update_look = 0; 203 pl->ns->update_look = 0;
199 204
200 if (QUERY_FLAG (ob, FLAG_REMOVED) 205 if (ob->flag [FLAG_REMOVED]
201 || !ob->map 206 || !ob->map
202 || ob->map->in_memory != MAP_ACTIVE 207 || ob->map->in_memory != MAP_ACTIVE
203 || out_of_map (ob->map, ob->x, ob->y)) 208 || out_of_map (ob->map, ob->x, ob->y))
204 return; 209 return;
205
206 pl->ns->send_packet ("delinv 0");
207 210
208 packet sl; 211 packet sl;
209 sl.printf ("item%d ", pl->ns->itemcmd); 212 sl.printf ("item%d ", pl->ns->itemcmd);
210 213
211 sl << uint32 (0); 214 sl << uint32 (0);
… …
448 451
449 if (flags & UPD_ANIMSPEED) 452 if (flags & UPD_ANIMSPEED)
450 { 453 {
451 int anim_speed = 0; 454 int anim_speed = 0;
452 455
453 if (QUERY_FLAG (op, FLAG_ANIMATE)) 456 if (op->flag [FLAG_ANIMATE])
454 { 457 {
455 if (op->anim_speed) 458 if (op->anim_speed)
456 anim_speed = op->anim_speed; 459 anim_speed = op->anim_speed;
457 else 460 else
458 { 461 {
… …
645 pl->failmsg ("Could not find object to lock/unlock"); 648 pl->failmsg ("Could not find object to lock/unlock");
646 return; 649 return;
647 } 650 }
648 651
649 if (!flag) 652 if (!flag)
650 CLEAR_FLAG (op, FLAG_INV_LOCKED); 653 op->clr_flag (FLAG_INV_LOCKED);
651 else 654 else
652 SET_FLAG (op, FLAG_INV_LOCKED); 655 op->set_flag (FLAG_INV_LOCKED);
653 656
654 esrv_update_item (UPD_FLAGS, pl->ob, op); 657 esrv_update_item (UPD_FLAGS, pl->ob, op);
655} 658}
656 659
657/** Client wants to mark some object. Lets do so. */ 660/** Client wants to mark some object. Lets do so. */
… …
718 else 721 else
719 { 722 {
720 if (pos.normalise ()) 723 if (pos.normalise ())
721 for (object *tmp = pos->top; tmp; tmp = tmp->below) 724 for (object *tmp = pos->top; tmp; tmp = tmp->below)
722 { 725 {
723 if (tmp->invisible && !QUERY_FLAG (ob, FLAG_WIZ)) 726 if (tmp->invisible && !ob->flag [FLAG_WIZ])
724 continue; 727 continue;
725 728
726 if (wiz) 729 if (wiz)
727 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 ());
728 else 731 else
… …
730 733
731 object *head = tmp->head_ (); 734 object *head = tmp->head_ ();
732 735
733 if (head->inv) 736 if (head->inv)
734 if ((head->type != CONTAINER && head->type != FLESH) 737 if ((head->type != CONTAINER && head->type != FLESH)
735 || QUERY_FLAG (ob, FLAG_WIZ)) 738 || ob->flag [FLAG_WIZ])
736 buf << head->query_inventory (ob, " "); 739 buf << head->query_inventory (ob, " ");
737 740
738 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 */
739 break; 742 break;
740 } 743 }
741 } 744 }
742 745
743 if (buf.empty ()) 746 if (buf.empty ())
… …
778 return; 781 return;
779 782
780 /* 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
781 * in the container and not the container itself. 784 * in the container and not the container itself.
782 */ 785 */
783 if (op->inv && QUERY_FLAG (op, FLAG_APPLIED)) 786 if (op->inv && op->flag [FLAG_APPLIED])
784 { 787 {
785 int cnt = MAX_ITEM_PER_ACTION; 788 int cnt = MAX_ITEM_PER_ACTION;
786 789
787 for (object *current = op->inv; current && cnt--; ) 790 for (object *current = op->inv; current && cnt--; )
788 { 791 {

Diff Legend

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