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 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,2007 Mark Wedel & Crossfire Development Team |
5 | * Copyright (©) 2002 Mark Wedel & Crossfire Development Team |
6 | * Copyright (©) 1992,2007 Frank Tore Johansen |
6 | * Copyright (©) 1992 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 | /** |
… | |
… | |
47 | |
48 | |
48 | /** |
49 | /** |
49 | * This is a similar to query_name, but returns flags |
50 | * This is a similar to query_name, but returns flags |
50 | * to be sent to client. |
51 | * to be sent to client. |
51 | */ |
52 | */ |
52 | unsigned int |
53 | static unsigned int |
53 | query_flags (object *op) |
54 | query_flags (object *op) |
54 | { |
55 | { |
55 | unsigned int flags = 0; |
56 | unsigned int flags = 0; |
56 | |
57 | |
57 | if (QUERY_FLAG (op, FLAG_APPLIED)) |
58 | if (op->flag [FLAG_APPLIED]) |
58 | switch (op->type) |
59 | switch (op->type) |
59 | { |
60 | { |
60 | case BOW: |
61 | case BOW: |
61 | case WAND: |
62 | case WAND: |
62 | case ROD: |
63 | case ROD: |
… | |
… | |
85 | default: |
86 | default: |
86 | flags = a_applied; |
87 | flags = a_applied; |
87 | break; |
88 | break; |
88 | } |
89 | } |
89 | |
90 | |
90 | if (op->type == CONTAINER && ((op->env && op->env->container == op) || (!op->env && QUERY_FLAG (op, FLAG_APPLIED)))) |
91 | if (op->is_open_container ()) |
91 | flags |= F_OPEN; |
92 | flags |= F_OPEN; |
92 | |
93 | |
93 | if (QUERY_FLAG (op, FLAG_KNOWN_CURSED)) |
94 | if (op->flag [FLAG_KNOWN_CURSED]) |
94 | { |
95 | { |
95 | if (QUERY_FLAG (op, FLAG_DAMNED)) |
96 | if (op->flag [FLAG_DAMNED]) |
96 | flags |= F_DAMNED; |
97 | flags |= F_DAMNED; |
97 | else if (QUERY_FLAG (op, FLAG_CURSED)) |
98 | else if (op->flag [FLAG_CURSED]) |
98 | flags |= F_CURSED; |
99 | flags |= F_CURSED; |
99 | } |
100 | } |
100 | |
101 | |
101 | if (QUERY_FLAG (op, FLAG_KNOWN_MAGICAL) && !QUERY_FLAG (op, FLAG_IDENTIFIED)) |
102 | if (op->flag [FLAG_KNOWN_MAGICAL] && !op->flag [FLAG_IDENTIFIED]) |
102 | flags |= F_MAGIC; |
103 | flags |= F_MAGIC; |
103 | if (QUERY_FLAG (op, FLAG_UNPAID)) |
104 | if (op->flag [FLAG_UNPAID]) |
104 | flags |= F_UNPAID; |
105 | flags |= F_UNPAID; |
105 | if (QUERY_FLAG (op, FLAG_INV_LOCKED)) |
106 | if (op->flag [FLAG_INV_LOCKED]) |
106 | flags |= F_LOCKED; |
107 | flags |= F_LOCKED; |
107 | |
108 | |
108 | return flags; |
109 | return flags; |
109 | } |
110 | } |
110 | |
111 | |
… | |
… | |
113 | * animation of face to the client. |
114 | * animation of face to the client. |
114 | */ |
115 | */ |
115 | static void |
116 | static void |
116 | add_object_to_socklist (client &ns, packet &sl, object *head) |
117 | add_object_to_socklist (client &ns, packet &sl, object *head) |
117 | { |
118 | { |
118 | char item_n[MAX_BUF]; |
|
|
119 | const char *item_p; |
|
|
120 | |
|
|
121 | int flags = query_flags (head); |
119 | int flags = query_flags (head); |
122 | if (QUERY_FLAG (head, FLAG_NO_PICK)) |
120 | |
|
|
121 | if (head->flag [FLAG_NO_PICK]) |
123 | flags |= F_NOPICK; |
122 | flags |= F_NOPICK; |
124 | |
123 | |
125 | ns.send_face (head->face, -50); |
124 | ns.send_face (head->face, -50); |
126 | ns.flush_fx (); |
|
|
127 | |
125 | |
128 | if (QUERY_FLAG (head, FLAG_ANIMATE) && !ns.anims_sent[head->animation_id]) |
126 | if (head->flag [FLAG_ANIMATE] && !ns.anims_sent[head->animation_id]) |
129 | ns.send_animation (head->animation_id); |
127 | ns.send_animation (head->animation_id); |
130 | |
128 | |
131 | sl << uint32 (head->count) |
129 | sl << uint32 (head->count) |
132 | << uint32 (flags) |
130 | << uint32 (flags) |
133 | << uint32 (QUERY_FLAG (head, FLAG_NO_PICK) ? -1 : head->client_weight ()) |
131 | << uint32 (head->flag [FLAG_NO_PICK] ? -1 : head->client_weight ()) |
134 | << uint32 (head->face); |
132 | << uint32 (head->face); |
135 | |
133 | |
136 | int len; |
|
|
137 | |
|
|
138 | if (!head->custom_name) |
134 | if (!head->custom_name) |
139 | { |
135 | { |
140 | strncpy (item_n, query_base_name (head, 0), 127); |
136 | const char *name; |
141 | item_n[127] = 0; |
137 | uint8 *len = sl.cur++; // patch up length later |
142 | len = strlen (item_n); |
138 | |
143 | item_p = query_base_name (head, 1); |
139 | name = query_base_name (head, 0); sl << data (name, min (127, strlen (name))); |
|
|
140 | sl << uint8 (0); |
|
|
141 | name = query_base_name (head, 1); sl << data (name, min (127, strlen (name))); |
|
|
142 | |
|
|
143 | *len = sl.cur - len - 1; |
144 | } |
144 | } |
145 | else |
145 | else |
146 | { |
146 | { |
147 | strncpy (item_n, head->custom_name, 127); |
147 | int len = min (127, head->custom_name.length ()); |
148 | item_n[127] = 0; |
|
|
149 | len = strlen (item_n); |
|
|
150 | item_p = head->custom_name; |
|
|
151 | } |
|
|
152 | |
148 | |
153 | strncpy (item_n + len + 1, item_p, 127); |
149 | sl << uint8 (len * 2 + 1) |
154 | item_n[254] = 0; |
150 | << data (head->custom_name, len) |
155 | len += strlen (item_n + 1 + len) + 1; |
151 | << uint8 (0) |
|
|
152 | << data (head->custom_name, len); |
|
|
153 | } |
156 | |
154 | |
157 | sl << data8 (item_n, len) |
|
|
158 | << uint16 (head->animation_id); |
155 | sl << uint16 (head->animation_id); |
159 | |
156 | |
160 | int anim_speed = !head->flag [FLAG_ANIMATE] ? 0 |
157 | int anim_speed = !head->flag [FLAG_ANIMATE] ? 0 |
161 | : head->anim_speed ? clamp (head->anim_speed, 1, 255) |
158 | : head->anim_speed ? clamp (head->anim_speed, 1, 255) |
162 | : 1. / clamp (fabs (head->speed), 1./255., 1./1.); |
159 | : 1. / clamp (head->speed, 1./255., 1./1.); |
163 | |
160 | |
164 | sl << uint8 (anim_speed) |
161 | sl << uint8 (anim_speed) |
165 | << uint32 (head->nrof); |
162 | << uint32 (head->nrof); |
166 | |
163 | |
167 | if (ns.itemcmd == 2) |
164 | if (ns.itemcmd == 2) |
… | |
… | |
196 | { |
193 | { |
197 | 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); |
198 | return; |
195 | return; |
199 | } |
196 | } |
200 | |
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 | |
201 | pl->ns->update_look = 0; |
207 | pl->ns->update_look = 0; |
|
|
208 | pl->ns->need_delinv0 = 1; |
202 | |
209 | |
203 | if (QUERY_FLAG (ob, FLAG_REMOVED) |
210 | if (ob->flag [FLAG_REMOVED] |
204 | || !ob->map |
211 | || !ob->map |
205 | || ob->map->in_memory != MAP_ACTIVE |
212 | || ob->map->state != MAP_ACTIVE |
206 | || out_of_map (ob->map, ob->x, ob->y)) |
213 | || out_of_map (ob->map, ob->x, ob->y)) |
207 | return; |
214 | return; |
208 | |
|
|
209 | pl->ns->send_packet ("delinv 0"); |
|
|
210 | |
215 | |
211 | packet sl; |
216 | packet sl; |
212 | sl.printf ("item%d ", pl->ns->itemcmd); |
217 | sl.printf ("item%d ", pl->ns->itemcmd); |
213 | |
218 | |
214 | sl << uint32 (0); |
219 | sl << uint32 (0); |
… | |
… | |
281 | dirty = true; |
286 | dirty = true; |
282 | |
287 | |
283 | // if packet got too large, send it and begin a new one |
288 | // if packet got too large, send it and begin a new one |
284 | if (sl.length () > MAXSOCKBUF - MAXITEMLEN) |
289 | if (sl.length () > MAXSOCKBUF - MAXITEMLEN) |
285 | { |
290 | { |
|
|
291 | pl->ns->flush_fx (); |
286 | pl->ns->send_packet (sl); |
292 | pl->ns->send_packet (sl); |
287 | |
293 | |
288 | sl.reset (); |
294 | sl.reset (); |
289 | sl.printf ("item%d ", pl->ns->itemcmd); |
295 | sl.printf ("item%d ", pl->ns->itemcmd); |
290 | sl << uint32 (0); |
296 | sl << uint32 (0); |
… | |
… | |
309 | |
315 | |
310 | dirty = true; |
316 | dirty = true; |
311 | } |
317 | } |
312 | |
318 | |
313 | if (dirty) |
319 | if (dirty) |
|
|
320 | { |
|
|
321 | pl->ns->flush_fx (); |
314 | pl->ns->send_packet (sl); |
322 | pl->ns->send_packet (sl); |
|
|
323 | } |
315 | } |
324 | } |
316 | |
325 | |
317 | /** |
326 | /** |
318 | * Sends whole inventory. |
327 | * Sends whole inventory. |
319 | */ |
328 | */ |
… | |
… | |
351 | * items (especially with some of the bags out there) to |
360 | * items (especially with some of the bags out there) to |
352 | * overflow the buffer. IF so, send multiple item commands. |
361 | * overflow the buffer. IF so, send multiple item commands. |
353 | */ |
362 | */ |
354 | if (sl.length () > MAXSOCKBUF - MAXITEMLEN) |
363 | if (sl.length () > MAXSOCKBUF - MAXITEMLEN) |
355 | { |
364 | { |
|
|
365 | pl->contr->ns->flush_fx (); |
356 | pl->contr->ns->send_packet (sl); |
366 | pl->contr->ns->send_packet (sl); |
357 | |
367 | |
358 | sl.reset (); |
368 | sl.reset (); |
359 | sl.printf ("item%d ", pl->contr->ns->itemcmd); |
369 | sl.printf ("item%d ", pl->contr->ns->itemcmd); |
360 | sl << uint32 (op->count); |
370 | sl << uint32 (op->count); |
… | |
… | |
362 | } |
372 | } |
363 | } |
373 | } |
364 | } |
374 | } |
365 | |
375 | |
366 | if (got_one) |
376 | if (got_one) |
|
|
377 | { |
|
|
378 | pl->contr->ns->flush_fx (); |
367 | pl->contr->ns->send_packet (sl); |
379 | pl->contr->ns->send_packet (sl); |
|
|
380 | } |
368 | } |
381 | } |
369 | |
382 | |
370 | /** |
383 | /** |
371 | * Updates object *op for player *pl. |
384 | * Updates object *op for player *pl. |
372 | * |
385 | * |
… | |
… | |
443 | |
456 | |
444 | if (flags & UPD_ANIMSPEED) |
457 | if (flags & UPD_ANIMSPEED) |
445 | { |
458 | { |
446 | int anim_speed = 0; |
459 | int anim_speed = 0; |
447 | |
460 | |
448 | if (QUERY_FLAG (op, FLAG_ANIMATE)) |
461 | if (op->flag [FLAG_ANIMATE]) |
449 | { |
462 | { |
450 | if (op->anim_speed) |
463 | if (op->anim_speed) |
451 | anim_speed = op->anim_speed; |
464 | anim_speed = op->anim_speed; |
452 | else |
465 | else |
453 | { |
466 | { |
454 | if (fabs (op->speed) < 0.001) |
467 | if (op->speed < 0.001) |
455 | anim_speed = 255; |
468 | anim_speed = 255; |
456 | else if (fabs (op->speed) >= 1.0) |
469 | else if (op->speed >= 1.0) |
457 | anim_speed = 1; |
470 | anim_speed = 1; |
458 | else |
471 | else |
459 | anim_speed = (int) (1.0 / fabs (op->speed)); |
472 | anim_speed = 1. / op->speed; |
460 | } |
473 | } |
461 | |
474 | |
462 | if (anim_speed > 255) |
475 | if (anim_speed > 255) |
463 | anim_speed = 255; |
476 | anim_speed = 255; |
464 | } |
477 | } |
… | |
… | |
493 | |
506 | |
494 | sl << uint32 (op->env ? op->env->count : 0); |
507 | sl << uint32 (op->env ? op->env->count : 0); |
495 | |
508 | |
496 | add_object_to_socklist (*pl->contr->ns, sl, op); |
509 | add_object_to_socklist (*pl->contr->ns, sl, op); |
497 | |
510 | |
|
|
511 | pl->contr->ns->flush_fx (); |
498 | pl->contr->ns->send_packet (sl); |
512 | pl->contr->ns->send_packet (sl); |
499 | } |
513 | } |
500 | |
514 | |
501 | /** |
515 | /** |
502 | * Tells the client to delete an item. |
516 | * Tells the client to delete an item. |
… | |
… | |
523 | |
537 | |
524 | /** |
538 | /** |
525 | * Takes a player and object count (tag) and returns the actual object |
539 | * Takes a player and object count (tag) and returns the actual object |
526 | * pointer, or null if it can't be found. |
540 | * pointer, or null if it can't be found. |
527 | */ |
541 | */ |
528 | object * |
542 | static object * |
529 | esrv_get_ob_from_count (object *pl, tag_t count) |
543 | esrv_get_ob_from_count (object *pl, tag_t count) |
530 | { |
544 | { |
531 | if (pl->count == count) |
545 | if (pl->count == count) |
532 | return pl; |
546 | return pl; |
533 | |
547 | |
534 | for (object *op = pl->inv; op; op = op->below) |
548 | for (object *op = pl->inv; op; op = op->below) |
535 | if (op->count == count) |
549 | if (op->count == count) |
536 | return op; |
550 | return op; |
537 | else if (op->type == CONTAINER && pl->container == op) |
551 | else if (op->type == CONTAINER && pl->container_ () == op) |
538 | for (object *tmp = op->inv; tmp; tmp = tmp->below) |
552 | for (object *tmp = op->inv; tmp; tmp = tmp->below) |
539 | if (tmp->count == count) |
553 | if (tmp->count == count) |
540 | return tmp; |
554 | return tmp; |
541 | |
555 | |
542 | for (object *op = GET_MAP_OB (pl->map, pl->x, pl->y); op; op = op->above) |
556 | for (object *op = GET_MAP_OB (pl->map, pl->x, pl->y); op; op = op->above) |
543 | if (op->head && op->head->count == count) |
557 | if (op->head && op->head->count == count) |
544 | return op; |
558 | return op; |
545 | else if (op->count == count) |
559 | else if (op->count == count) |
546 | return op; |
560 | return op; |
547 | else if (op->type == CONTAINER && pl->container == op) |
561 | else if (op->type == CONTAINER && pl->container_ () == op) |
548 | for (object *tmp = op->inv; tmp; tmp = tmp->below) |
562 | for (object *tmp = op->inv; tmp; tmp = tmp->below) |
549 | if (tmp->count == count) |
563 | if (tmp->count == count) |
550 | return tmp; |
564 | return tmp; |
551 | |
565 | |
552 | #if 0 |
566 | #if 0 |
… | |
… | |
613 | pl->ns->look_position = tag & 0x7fffffff; |
627 | pl->ns->look_position = tag & 0x7fffffff; |
614 | pl->ns->floorbox_update (); |
628 | pl->ns->floorbox_update (); |
615 | return; |
629 | return; |
616 | } |
630 | } |
617 | |
631 | |
|
|
632 | // the object might be legally gone already |
618 | object *op = esrv_get_ob_from_count (pl->ob, tag); |
633 | if (object *op = esrv_get_ob_from_count (pl->ob, tag)) |
619 | |
634 | pl->ob->apply (op, AP_TOGGLE); |
620 | if (!op) |
|
|
621 | { |
|
|
622 | LOG (llevDebug, "Player '%s' tried to apply the unknown object (%d)\n", &pl->ob->name, tag); |
|
|
623 | return; |
|
|
624 | } |
|
|
625 | |
|
|
626 | player_apply (pl->ob, op, 0, 0); |
|
|
627 | } |
635 | } |
628 | |
636 | |
629 | /** Client wants to lock some object. Lets do so. */ |
637 | /** Client wants to lock some object. Lets do so. */ |
630 | void |
638 | void |
631 | LockItem (char *data, int len, player *pl) |
639 | LockItem (char *data, int len, player *pl) |
… | |
… | |
639 | pl->failmsg ("Could not find object to lock/unlock"); |
647 | pl->failmsg ("Could not find object to lock/unlock"); |
640 | return; |
648 | return; |
641 | } |
649 | } |
642 | |
650 | |
643 | if (!flag) |
651 | if (!flag) |
644 | CLEAR_FLAG (op, FLAG_INV_LOCKED); |
652 | op->clr_flag (FLAG_INV_LOCKED); |
645 | else |
653 | else |
646 | SET_FLAG (op, FLAG_INV_LOCKED); |
654 | op->set_flag (FLAG_INV_LOCKED); |
647 | |
655 | |
648 | esrv_update_item (UPD_FLAGS, pl->ob, op); |
656 | esrv_update_item (UPD_FLAGS, pl->ob, op); |
649 | } |
657 | } |
650 | |
658 | |
651 | /** Client wants to mark some object. Lets do so. */ |
659 | /** Client wants to mark some object. Lets do so. */ |
… | |
… | |
672 | * Tero.Haatanen@lut.fi ] |
680 | * Tero.Haatanen@lut.fi ] |
673 | */ |
681 | */ |
674 | static void |
682 | static void |
675 | look_at (player *pl, int dx, int dy) |
683 | look_at (player *pl, int dx, int dy) |
676 | { |
684 | { |
677 | dynbuf_text buf; |
685 | dynbuf_text &buf = msg_dynbuf; buf.clear (); |
678 | object *ob = pl->ob; |
686 | object *ob = pl->ob; |
679 | |
687 | |
680 | if (!pl->observe->map) |
688 | if (!pl->observe->map) |
681 | return; |
689 | return; |
682 | |
690 | |
… | |
… | |
691 | { |
699 | { |
692 | mapspace &ms = *pos; |
700 | mapspace &ms = *pos; |
693 | ms.update (); |
701 | ms.update (); |
694 | |
702 | |
695 | buf.printf (" map: %s%+d%+d (%+d%+d)\n" |
703 | buf.printf (" map: %s%+d%+d (%+d%+d)\n" |
696 | " smell %u/%u; flags %x; light %d; block %x; slow %x; on %x; off %x; volume %lld\n\n", |
704 | " smell %u/%u; flags %x; light %d; block %x; slow %x; on %x; off %x; items %d, volume %lld\n\n", |
697 | &pos.m->path, pos.x, pos.y, dx, dy, |
705 | &pos.m->path, pos.x, pos.y, dx, dy, |
698 | (unsigned int)ms.smell, (unsigned int)mapspace::smellcount, ms.flags (), ms.light, |
706 | (unsigned int)ms.smell, (unsigned int)mapspace::smellcount, ms.flags (), ms.light, |
699 | ms.move_block, ms.move_slow, ms.move_on, ms.move_off, (long long)ms.volume () |
707 | ms.move_block, ms.move_slow, ms.move_on, ms.move_off, (int)ms.items (), (long long)ms.volume () |
700 | ); |
708 | ); |
701 | } |
709 | } |
702 | else |
710 | else |
703 | buf << "off-map\n\n"; |
711 | buf << "off-map\n\n"; |
704 | } |
712 | } |
… | |
… | |
712 | else |
720 | else |
713 | { |
721 | { |
714 | if (pos.normalise ()) |
722 | if (pos.normalise ()) |
715 | for (object *tmp = pos->top; tmp; tmp = tmp->below) |
723 | for (object *tmp = pos->top; tmp; tmp = tmp->below) |
716 | { |
724 | { |
717 | if (tmp->invisible && !QUERY_FLAG (ob, FLAG_WIZ)) |
725 | if (tmp->invisible && !ob->flag [FLAG_WIZ]) |
718 | continue; |
726 | continue; |
719 | |
727 | |
720 | if (wiz) |
728 | if (wiz) |
721 | buf.printf (" - %s (%d).\n", query_name (tmp), tmp->count); |
729 | buf.printf (" - %s (%d) %s\n", query_name (tmp), tmp->count, tmp->uuid.c_str ()); |
722 | else |
730 | else |
723 | buf.printf (" - %s.\n", query_name (tmp)); |
731 | buf.printf (" - %s.\n", query_name (tmp)); |
724 | |
732 | |
725 | object *head = tmp->head_ (); |
733 | object *head = tmp->head_ (); |
726 | |
734 | |
727 | if (head->inv) |
735 | if (head->inv) |
728 | if ((head->type != CONTAINER && head->type != FLESH) |
736 | if ((head->type != CONTAINER && head->type != FLESH) |
729 | || QUERY_FLAG (ob, FLAG_WIZ)) |
737 | || ob->flag [FLAG_WIZ]) |
730 | buf << head->query_inventory (ob, " "); |
738 | buf << head->query_inventory (ob, " "); |
731 | |
739 | |
732 | 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 */ |
733 | break; |
741 | break; |
734 | } |
742 | } |
735 | } |
743 | } |
736 | |
744 | |
737 | if (buf.empty ()) |
745 | if (buf.empty ()) |
… | |
… | |
772 | return; |
780 | return; |
773 | |
781 | |
774 | /* 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 |
775 | * in the container and not the container itself. |
783 | * in the container and not the container itself. |
776 | */ |
784 | */ |
777 | if (op->inv && QUERY_FLAG (op, FLAG_APPLIED)) |
785 | if (op->inv && op->flag [FLAG_APPLIED]) |
778 | { |
786 | { |
779 | int cnt = MAX_ITEM_PER_DROP; |
787 | int cnt = MAX_ITEM_PER_ACTION; |
780 | |
788 | |
781 | for (object *current = op->inv; current && cnt--; ) |
789 | for (object *current = op->inv; current && cnt--; ) |
782 | { |
790 | { |
783 | object *next = current->below; |
791 | object *next = current->below; |
784 | drop_object (pl, current, 0); |
792 | drop_object (pl, current, 0); |