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 Marc Alexander Lehmann / Robin Redeker / the Deliantra team |
5 | * Copyright (©) 2001,2007 Mark Wedel & Crossfire Development Team |
5 | * Copyright (©) 2001,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 | #include <global.h> |
25 | #include <global.h> |
… | |
… | |
32 | #include <bitset> |
33 | #include <bitset> |
33 | |
34 | |
34 | UUID UUID::cur; |
35 | UUID UUID::cur; |
35 | static uint64_t seq_next_save; |
36 | static uint64_t seq_next_save; |
36 | static const uint64 UUID_GAP = 1<<19; |
37 | static const uint64 UUID_GAP = 1<<19; |
|
|
38 | uint32_t mapspace::smellcount = 10000; |
37 | |
39 | |
38 | objectvec objects; |
40 | objectvec objects; |
39 | activevec actives; |
41 | activevec actives; |
|
|
42 | |
|
|
43 | //+GPL |
40 | |
44 | |
41 | short freearr_x[SIZEOFFREE] = { |
45 | short freearr_x[SIZEOFFREE] = { |
42 | 0, |
46 | 0, |
43 | 0, 1, 1, 1, 0, -1, -1, -1, |
47 | 0, 1, 1, 1, 0, -1, -1, -1, |
44 | 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, -2, -2, -2, -1, |
48 | 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, -2, -2, -2, -1, |
… | |
… | |
48 | 0, |
52 | 0, |
49 | -1, -1, 0, 1, 1, 1, 0, -1, |
53 | -1, -1, 0, 1, 1, 1, 0, -1, |
50 | -2, -2, -2, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, |
54 | -2, -2, -2, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, |
51 | -3, -3, -3, -3, -2, -1, 0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3 |
55 | -3, -3, -3, -3, -2, -1, 0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3 |
52 | }; |
56 | }; |
53 | int maxfree[SIZEOFFREE] = { |
|
|
54 | 0, |
|
|
55 | 9, 10, 13, 14, 17, 18, 21, 22, |
|
|
56 | 25, 26, 27, 30, 31, 32, 33, 36, 37, 39, 39, 42, 43, 44, 45, 48, |
|
|
57 | 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49 |
|
|
58 | }; |
|
|
59 | int freedir[SIZEOFFREE] = { |
57 | int freedir[SIZEOFFREE] = { |
60 | 0, |
58 | 0, |
61 | 1, 2, 3, 4, 5, 6, 7, 8, |
59 | 1, 2, 3, 4, 5, 6, 7, 8, |
62 | 1, 2, 2, 2, 3, 4, 4, 4, 5, 6, 6, 6, 7, 8, 8, 8, |
60 | 1, 2, 2, 2, 3, 4, 4, 4, 5, 6, 6, 6, 7, 8, 8, 8, |
63 | 1, 2, 2, 2, 2, 2, 3, 4, 4, 4, 4, 4, 5, 6, 6, 6, 6, 6, 7, 8, 8, 8, 8, 8 |
61 | 1, 2, 2, 2, 2, 2, 3, 4, 4, 4, 4, 4, 5, 6, 6, 6, 6, 6, 7, 8, 8, 8, 8, 8 |
|
|
62 | }; |
|
|
63 | |
|
|
64 | static int maxfree[SIZEOFFREE] = { |
|
|
65 | 0, |
|
|
66 | 9, 10, 13, 14, 17, 18, 21, 22, |
|
|
67 | 25, 26, 27, 30, 31, 32, 33, 36, 37, 39, 39, 42, 43, 44, 45, 48, |
|
|
68 | 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49 |
64 | }; |
69 | }; |
65 | |
70 | |
66 | static void |
71 | static void |
67 | write_uuid (uval64 skip, bool sync) |
72 | write_uuid (uval64 skip, bool sync) |
68 | { |
73 | { |
… | |
… | |
186 | || ob1->speed != ob2->speed |
191 | || ob1->speed != ob2->speed |
187 | || ob1->value != ob2->value |
192 | || ob1->value != ob2->value |
188 | || ob1->name != ob2->name) |
193 | || ob1->name != ob2->name) |
189 | return 0; |
194 | return 0; |
190 | |
195 | |
191 | /* Do not merge objects if nrof would overflow. First part checks |
196 | /* Do not merge objects if nrof would overflow, assume nrof |
192 | * for unsigned overflow (2c), second part checks whether the result |
197 | * is always 0 .. 2**31-1 */ |
193 | * would fit into a 32 bit signed int, which is often used to hold |
198 | if (ob1->nrof > 0x7fffffff - ob2->nrof) |
194 | * nrof values. |
|
|
195 | */ |
|
|
196 | if (~ob1->nrof < ob2->nrof || ob1->nrof + ob2->nrof > (1UL << 31)) |
|
|
197 | return 0; |
199 | return 0; |
198 | |
200 | |
199 | /* If the objects have been identified, set the BEEN_APPLIED flag. |
201 | /* If the objects have been identified, set the BEEN_APPLIED flag. |
200 | * This is to the comparison of the flags below will be OK. We |
202 | * This is to the comparison of the flags below will be OK. We |
201 | * just can't ignore the been applied or identified flags, as they |
203 | * just can't ignore the been applied or identified flags, as they |
… | |
… | |
206 | SET_FLAG (ob1, FLAG_BEEN_APPLIED); |
208 | SET_FLAG (ob1, FLAG_BEEN_APPLIED); |
207 | |
209 | |
208 | if (QUERY_FLAG (ob2, FLAG_IDENTIFIED)) |
210 | if (QUERY_FLAG (ob2, FLAG_IDENTIFIED)) |
209 | SET_FLAG (ob2, FLAG_BEEN_APPLIED); |
211 | SET_FLAG (ob2, FLAG_BEEN_APPLIED); |
210 | |
212 | |
211 | if (ob1->arch->name != ob2->arch->name |
213 | if (ob1->arch->archname != ob2->arch->archname |
212 | || ob1->name != ob2->name |
214 | || ob1->name != ob2->name |
213 | || ob1->title != ob2->title |
215 | || ob1->title != ob2->title |
214 | || ob1->msg != ob2->msg |
216 | || ob1->msg != ob2->msg |
215 | || ob1->weight != ob2->weight |
217 | || ob1->weight != ob2->weight |
216 | || ob1->attacktype != ob2->attacktype |
218 | || ob1->attacktype != ob2->attacktype |
217 | || ob1->magic != ob2->magic |
219 | || ob1->magic != ob2->magic |
218 | || ob1->slaying != ob2->slaying |
220 | || ob1->slaying != ob2->slaying |
219 | || ob1->skill != ob2->skill |
221 | || ob1->skill != ob2->skill |
220 | || ob1->value != ob2->value |
222 | || ob1->value != ob2->value |
221 | || ob1->animation_id != ob2->animation_id |
223 | || ob1->animation_id != ob2->animation_id |
|
|
224 | || (ob1->face != ob2->face && !ob1->animation_id) // face and animation are dependent on each other |
222 | || ob1->client_type != ob2->client_type |
225 | || ob1->client_type != ob2->client_type |
223 | || ob1->materialname != ob2->materialname |
226 | || ob1->materialname != ob2->materialname |
224 | || ob1->lore != ob2->lore |
227 | || ob1->lore != ob2->lore |
225 | || ob1->subtype != ob2->subtype |
228 | || ob1->subtype != ob2->subtype |
226 | || ob1->move_type != ob2->move_type |
229 | || ob1->move_type != ob2->move_type |
… | |
… | |
234 | || memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats))) |
237 | || memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats))) |
235 | return 0; |
238 | return 0; |
236 | |
239 | |
237 | if ((ob1->flag ^ ob2->flag) |
240 | if ((ob1->flag ^ ob2->flag) |
238 | .reset (FLAG_INV_LOCKED) |
241 | .reset (FLAG_INV_LOCKED) |
239 | .reset (FLAG_CLIENT_SENT) |
|
|
240 | .reset (FLAG_REMOVED) |
242 | .reset (FLAG_REMOVED) |
241 | .any ()) |
243 | .any ()) |
242 | return 0; |
244 | return 0; |
243 | |
245 | |
244 | /* This is really a spellbook check - we should in general |
246 | /* This is really a spellbook check - we should in general |
… | |
… | |
326 | { |
328 | { |
327 | // see if we are in a container of sorts |
329 | // see if we are in a container of sorts |
328 | if (env) |
330 | if (env) |
329 | { |
331 | { |
330 | // the player inventory itself is always visible |
332 | // the player inventory itself is always visible |
331 | if (env->type == PLAYER) |
333 | if (env->is_player ()) |
332 | return env; |
334 | return env; |
333 | |
335 | |
334 | // else a player could have our env open |
336 | // else a player could have our env open |
335 | object *envest = env->outer_env (); |
337 | object *envest = env->outer_env_or_self (); |
336 | |
338 | |
337 | // the player itself is always on a map, so we will find him here |
339 | // the player itself is always on a map, so we will find him here |
338 | // even if our inv is in a player. |
340 | // even if our inv is in a player. |
339 | if (envest->is_on_map ()) |
341 | if (envest->is_on_map ()) |
340 | if (object *pl = envest->ms ().player ()) |
342 | if (object *pl = envest->ms ().player ()) |
341 | if (pl->container == env) |
343 | if (pl->container_ () == env) |
342 | return pl; |
344 | return pl; |
343 | } |
345 | } |
344 | else |
346 | else |
345 | { |
347 | { |
346 | // maybe there is a player standing on the same mapspace |
348 | // maybe there is a player standing on the same mapspace |
347 | // this will catch the case where "this" is a player |
349 | // this will catch the case where "this" is a player |
348 | if (object *pl = ms ().player ()) |
350 | if (object *pl = ms ().player ()) |
349 | if (!pl->container || this == pl->container) |
351 | if ((pl->contr->ns && !pl->container_ () && !pl->contr->ns->update_look) |
|
|
352 | || pl->container_ () == this) |
350 | return pl; |
353 | return pl; |
351 | } |
354 | } |
352 | } |
355 | } |
353 | |
356 | |
354 | return 0; |
357 | return 0; |
… | |
… | |
432 | object_freezer freezer; |
435 | object_freezer freezer; |
433 | op->write (freezer); |
436 | op->write (freezer); |
434 | return freezer.as_string (); |
437 | return freezer.as_string (); |
435 | } |
438 | } |
436 | |
439 | |
|
|
440 | char * |
|
|
441 | object::as_string () |
|
|
442 | { |
|
|
443 | return dump_object (this); |
|
|
444 | } |
|
|
445 | |
437 | /* |
446 | /* |
438 | * get_nearest_part(multi-object, object 2) returns the part of the |
447 | * get_nearest_part(multi-object, object 2) returns the part of the |
439 | * multi-object 1 which is closest to the second object. |
448 | * multi-object 1 which is closest to the second object. |
440 | * If it's not a multi-object, it is returned. |
449 | * If it's not a multi-object, it is returned. |
441 | */ |
450 | */ |
442 | object * |
451 | static object * |
443 | get_nearest_part (object *op, const object *pl) |
452 | get_nearest_part (object *op, const object *pl) |
444 | { |
453 | { |
445 | object *tmp, *closest; |
454 | object *tmp, *closest; |
446 | int last_dist, i; |
455 | int last_dist, i; |
447 | |
456 | |
… | |
… | |
478 | */ |
487 | */ |
479 | object * |
488 | object * |
480 | find_object_name (const char *str) |
489 | find_object_name (const char *str) |
481 | { |
490 | { |
482 | shstr_cmp str_ (str); |
491 | shstr_cmp str_ (str); |
483 | object *op; |
|
|
484 | |
492 | |
|
|
493 | if (str_) |
485 | for_all_objects (op) |
494 | for_all_objects (op) |
486 | if (op->name == str_) |
495 | if (op->name == str_) |
487 | break; |
496 | return op; |
488 | |
497 | |
489 | return op; |
498 | return 0; |
490 | } |
499 | } |
491 | |
500 | |
492 | /* |
501 | /* |
493 | * Sets the owner and sets the skill and exp pointers to owner's current |
502 | * Sets the owner and sets the skill and exp pointers to owner's current |
494 | * skill and experience objects. |
503 | * skill and experience objects. |
… | |
… | |
556 | update_stats (); |
565 | update_stats (); |
557 | |
566 | |
558 | new_draw_info_format (NDI_UNIQUE, 0, this, |
567 | new_draw_info_format (NDI_UNIQUE, 0, this, |
559 | "You try to balance all your items at once, " |
568 | "You try to balance all your items at once, " |
560 | "but the %s is just too much for your body. " |
569 | "but the %s is just too much for your body. " |
561 | "[You need to unapply some items first.]", &ob->name); |
570 | "[You need to unapply some items first - use the 'body' command to see " |
|
|
571 | "how many items you cna wera on a specific body part.]", &ob->name); |
562 | return false; |
572 | return false; |
563 | } |
573 | } |
564 | |
574 | |
565 | //new_draw_info_format (NDI_UNIQUE, 0, this, "You switch to your %s.", &ob->name); |
575 | //new_draw_info_format (NDI_UNIQUE, 0, this, "You switch to your %s.", &ob->name); |
566 | } |
576 | } |
… | |
… | |
638 | } |
648 | } |
639 | |
649 | |
640 | if (speed < 0) |
650 | if (speed < 0) |
641 | dst->speed_left -= rndm (); |
651 | dst->speed_left -= rndm (); |
642 | |
652 | |
643 | dst->set_speed (dst->speed); |
653 | dst->activate (); |
644 | } |
654 | } |
645 | |
655 | |
646 | void |
656 | void |
647 | object::instantiate () |
657 | object::instantiate () |
648 | { |
658 | { |
… | |
… | |
760 | else if (action == UP_OBJ_INSERT) |
770 | else if (action == UP_OBJ_INSERT) |
761 | { |
771 | { |
762 | // this is likely overkill, TODO: revisit (schmorp) |
772 | // this is likely overkill, TODO: revisit (schmorp) |
763 | if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW)) |
773 | if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW)) |
764 | || (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC)) |
774 | || (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC)) |
765 | || (op->type == PLAYER && !(m.flags_ & P_PLAYER)) |
775 | || (op->is_player () && !(m.flags_ & P_PLAYER)) |
766 | || (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE)) |
776 | || (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE)) |
767 | || (QUERY_FLAG (op, FLAG_ALIVE) && !(m.flags_ & P_IS_ALIVE)) |
777 | || (QUERY_FLAG (op, FLAG_ALIVE) && !(m.flags_ & P_IS_ALIVE)) |
768 | || (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC)) |
778 | || (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC)) |
769 | || (m.move_on | op->move_on ) != m.move_on |
779 | || (m.move_on | op->move_on ) != m.move_on |
770 | || (m.move_off | op->move_off ) != m.move_off |
780 | || (m.move_off | op->move_off ) != m.move_off |
771 | || (m.move_slow | op->move_slow) != m.move_slow |
781 | || (m.move_slow | op->move_slow) != m.move_slow |
772 | /* This isn't perfect, but I don't expect a lot of objects to |
782 | /* This isn't perfect, but I don't expect a lot of objects to |
773 | * to have move_allow right now. |
783 | * have move_allow right now. |
774 | */ |
784 | */ |
775 | || ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block |
785 | || ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block |
776 | || 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp) |
786 | || 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp) |
777 | m.flags_ = 0; |
787 | m.invalidate (); |
778 | } |
788 | } |
779 | /* if the object is being removed, we can't make intelligent |
789 | /* if the object is being removed, we can't make intelligent |
780 | * decisions, because remove_ob can't really pass the object |
790 | * decisions, because remove_ob can't really pass the object |
781 | * that is being removed. |
791 | * that is being removed. |
782 | */ |
792 | */ |
783 | else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE) |
793 | else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE) |
784 | m.flags_ = 0; |
794 | m.invalidate (); |
785 | else if (action == UP_OBJ_FACE) |
795 | else if (action == UP_OBJ_FACE) |
786 | /* Nothing to do for that case */ ; |
796 | /* Nothing to do for that case */ ; |
787 | else |
797 | else |
788 | LOG (llevError, "update_object called with invalid action: %d\n", action); |
798 | LOG (llevError, "update_object called with invalid action: %d\n", action); |
789 | |
799 | |
… | |
… | |
793 | |
803 | |
794 | object::object () |
804 | object::object () |
795 | { |
805 | { |
796 | SET_FLAG (this, FLAG_REMOVED); |
806 | SET_FLAG (this, FLAG_REMOVED); |
797 | |
807 | |
798 | expmul = 1.0; |
808 | //expmul = 1.0; declared const for the time being |
799 | face = blank_face; |
809 | face = blank_face; |
800 | } |
810 | } |
801 | |
811 | |
802 | object::~object () |
812 | object::~object () |
803 | { |
813 | { |
… | |
… | |
833 | /* If already on active list, don't do anything */ |
843 | /* If already on active list, don't do anything */ |
834 | if (active) |
844 | if (active) |
835 | return; |
845 | return; |
836 | |
846 | |
837 | if (has_active_speed ()) |
847 | if (has_active_speed ()) |
|
|
848 | { |
|
|
849 | if (flag [FLAG_FREED]) |
|
|
850 | LOG (llevError | logBacktrace, "BUG: tried to activate freed object %s\n", debug_desc ());//D |
|
|
851 | |
838 | actives.insert (this); |
852 | actives.insert (this); |
|
|
853 | } |
839 | } |
854 | } |
840 | |
855 | |
841 | void |
856 | void |
842 | object::activate_recursive () |
857 | object::activate_recursive () |
843 | { |
858 | { |
… | |
… | |
904 | * drop on that space. |
919 | * drop on that space. |
905 | */ |
920 | */ |
906 | if (!drop_to_ground |
921 | if (!drop_to_ground |
907 | || !map |
922 | || !map |
908 | || map->in_memory != MAP_ACTIVE |
923 | || map->in_memory != MAP_ACTIVE |
909 | || map->nodrop |
924 | || map->no_drop |
910 | || ms ().move_block == MOVE_ALL) |
925 | || ms ().move_block == MOVE_ALL) |
911 | { |
926 | { |
912 | while (inv) |
927 | while (inv) |
913 | { |
|
|
914 | inv->destroy_inv (false); |
|
|
915 | inv->destroy (); |
928 | inv->destroy (); |
916 | } |
|
|
917 | } |
929 | } |
918 | else |
930 | else |
919 | { /* Put objects in inventory onto this space */ |
931 | { /* Put objects in inventory onto this space */ |
920 | while (inv) |
932 | while (inv) |
921 | { |
933 | { |
… | |
… | |
925 | || op->flag [FLAG_NO_DROP] |
937 | || op->flag [FLAG_NO_DROP] |
926 | || op->type == RUNE |
938 | || op->type == RUNE |
927 | || op->type == TRAP |
939 | || op->type == TRAP |
928 | || op->flag [FLAG_IS_A_TEMPLATE] |
940 | || op->flag [FLAG_IS_A_TEMPLATE] |
929 | || op->flag [FLAG_DESTROY_ON_DEATH]) |
941 | || op->flag [FLAG_DESTROY_ON_DEATH]) |
930 | op->destroy (true); |
942 | op->destroy (); |
931 | else |
943 | else |
932 | map->insert (op, x, y); |
944 | map->insert (op, x, y); |
933 | } |
945 | } |
934 | } |
946 | } |
935 | } |
947 | } |
… | |
… | |
943 | |
955 | |
944 | static struct freed_map : maptile |
956 | static struct freed_map : maptile |
945 | { |
957 | { |
946 | freed_map () |
958 | freed_map () |
947 | { |
959 | { |
948 | path = "<freed objects map>"; |
960 | path = "<freed objects map>"; |
949 | name = "/internal/freed_objects_map"; |
961 | name = "/internal/freed_objects_map"; |
950 | width = 3; |
962 | width = 3; |
951 | height = 3; |
963 | height = 3; |
952 | nodrop = 1; |
964 | no_drop = 1; |
|
|
965 | no_reset = 1; |
953 | |
966 | |
954 | alloc (); |
967 | alloc (); |
955 | in_memory = MAP_ACTIVE; |
968 | in_memory = MAP_ACTIVE; |
956 | } |
969 | } |
957 | |
970 | |
… | |
… | |
963 | |
976 | |
964 | void |
977 | void |
965 | object::do_destroy () |
978 | object::do_destroy () |
966 | { |
979 | { |
967 | if (flag [FLAG_IS_LINKED]) |
980 | if (flag [FLAG_IS_LINKED]) |
968 | remove_button_link (this); |
981 | remove_link (); |
969 | |
982 | |
970 | if (flag [FLAG_FRIENDLY]) |
983 | if (flag [FLAG_FRIENDLY]) |
971 | remove_friendly_object (this); |
984 | remove_friendly_object (this); |
972 | |
985 | |
973 | remove (); |
986 | remove (); |
… | |
… | |
998 | attacked_by = 0; |
1011 | attacked_by = 0; |
999 | current_weapon = 0; |
1012 | current_weapon = 0; |
1000 | } |
1013 | } |
1001 | |
1014 | |
1002 | void |
1015 | void |
1003 | object::destroy (bool destroy_inventory) |
1016 | object::destroy () |
1004 | { |
1017 | { |
1005 | if (destroyed ()) |
1018 | if (destroyed ()) |
1006 | return; |
1019 | return; |
1007 | |
1020 | |
1008 | if (!is_head () && !head->destroyed ()) |
1021 | if (!is_head () && !head->destroyed ()) |
1009 | { |
1022 | { |
1010 | LOG (llevError | logBacktrace, "tried to destroy the tail of an object"); |
1023 | LOG (llevError | logBacktrace, "tried to destroy the tail of an object"); |
1011 | head->destroy (destroy_inventory); |
1024 | head->destroy (); |
1012 | return; |
1025 | return; |
1013 | } |
1026 | } |
1014 | |
1027 | |
1015 | destroy_inv (!destroy_inventory); |
1028 | destroy_inv (false); |
1016 | |
1029 | |
1017 | if (is_head ()) |
1030 | if (is_head ()) |
1018 | if (sound_destroy) |
1031 | if (sound_destroy) |
1019 | play_sound (sound_destroy); |
1032 | play_sound (sound_destroy); |
1020 | else if (flag [FLAG_MONSTER]) |
1033 | else if (flag [FLAG_MONSTER]) |
… | |
… | |
1031 | * the previous environment. |
1044 | * the previous environment. |
1032 | */ |
1045 | */ |
1033 | void |
1046 | void |
1034 | object::do_remove () |
1047 | object::do_remove () |
1035 | { |
1048 | { |
1036 | object *tmp, *last = 0; |
|
|
1037 | object *otmp; |
|
|
1038 | |
|
|
1039 | if (flag [FLAG_REMOVED]) |
1049 | if (flag [FLAG_REMOVED]) |
1040 | return; |
1050 | return; |
1041 | |
1051 | |
1042 | INVOKE_OBJECT (REMOVE, this); |
1052 | INVOKE_OBJECT (REMOVE, this); |
1043 | |
1053 | |
… | |
… | |
1057 | esrv_del_item (pl->contr, count); |
1067 | esrv_del_item (pl->contr, count); |
1058 | flag [FLAG_REMOVED] = true; // hack around the issue of visible_to checking flag_removed |
1068 | flag [FLAG_REMOVED] = true; // hack around the issue of visible_to checking flag_removed |
1059 | |
1069 | |
1060 | adjust_weight (env, -total_weight ()); |
1070 | adjust_weight (env, -total_weight ()); |
1061 | |
1071 | |
1062 | *(above ? &above->below : &env->inv) = below; |
1072 | object *pl = in_player (); |
1063 | |
|
|
1064 | if (below) |
|
|
1065 | below->above = above; |
|
|
1066 | |
1073 | |
1067 | /* we set up values so that it could be inserted into |
1074 | /* we set up values so that it could be inserted into |
1068 | * the map, but we don't actually do that - it is up |
1075 | * the map, but we don't actually do that - it is up |
1069 | * to the caller to decide what we want to do. |
1076 | * to the caller to decide what we want to do. |
1070 | */ |
1077 | */ |
1071 | map = env->map; |
1078 | map = env->map; |
1072 | x = env->x; |
1079 | x = env->x; |
1073 | y = env->y; |
1080 | y = env->y; |
|
|
1081 | |
|
|
1082 | // make sure cmov optimisation is applicable |
|
|
1083 | *(above ? &above->below : &env->inv) = below; |
|
|
1084 | *(below ? &below->above : &above ) = above; // &above is just a dummy |
|
|
1085 | |
1074 | above = 0; |
1086 | above = 0; |
1075 | below = 0; |
1087 | below = 0; |
1076 | env = 0; |
1088 | env = 0; |
1077 | |
1089 | |
1078 | /* NO_FIX_PLAYER is set when a great many changes are being |
1090 | /* NO_FIX_PLAYER is set when a great many changes are being |
1079 | * made to players inventory. If set, avoiding the call |
1091 | * made to players inventory. If set, avoiding the call |
1080 | * to save cpu time. |
1092 | * to save cpu time. |
1081 | */ |
1093 | */ |
1082 | if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) |
1094 | if (pl) |
|
|
1095 | if (pl->is_player () && (glow_radius || !QUERY_FLAG (pl, FLAG_NO_FIX_PLAYER))) |
|
|
1096 | { |
1083 | otmp->update_stats (); |
1097 | pl->update_stats (); |
|
|
1098 | |
|
|
1099 | if (glow_radius && pl->is_on_map ()) |
|
|
1100 | update_all_los (pl->map, pl->x, pl->y); |
|
|
1101 | } |
1084 | } |
1102 | } |
1085 | else if (map) |
1103 | else if (map) |
1086 | { |
1104 | { |
1087 | map->dirty = true; |
1105 | map->dirty = true; |
1088 | mapspace &ms = this->ms (); |
1106 | mapspace &ms = this->ms (); |
1089 | |
1107 | |
1090 | if (object *pl = ms.player ()) |
1108 | if (object *pl = ms.player ()) |
1091 | { |
1109 | { |
1092 | if (type == PLAYER) // this == pl(!) |
1110 | if (is_player ()) |
1093 | { |
1111 | { |
|
|
1112 | if (!flag [FLAG_WIZPASS]) |
|
|
1113 | ms.smell = ++mapspace::smellcount; // remember the smell of the player |
|
|
1114 | |
1094 | // leaving a spot always closes any open container on the ground |
1115 | // leaving a spot always closes any open container on the ground |
1095 | if (container && !container->env) |
1116 | if (container && !container->env) |
1096 | // this causes spurious floorbox updates, but it ensures |
1117 | // this causes spurious floorbox updates, but it ensures |
1097 | // that the CLOSE event is being sent. |
1118 | // that the CLOSE event is being sent. |
1098 | close_container (); |
1119 | close_container (); |
1099 | |
1120 | |
1100 | --map->players; |
1121 | --map->players; |
1101 | map->touch (); |
1122 | map->touch (); |
1102 | } |
1123 | } |
1103 | else if (pl->container == this) |
1124 | else if (pl->container_ () == this) |
1104 | { |
1125 | { |
1105 | // removing a container should close it |
1126 | // removing a container should close it |
1106 | close_container (); |
1127 | close_container (); |
1107 | } |
1128 | } |
1108 | |
1129 | |
1109 | esrv_del_item (pl->contr, count); |
1130 | esrv_del_item (pl->contr, count); |
1110 | } |
1131 | } |
1111 | |
1132 | |
1112 | /* link the object above us */ |
1133 | /* link the object above us */ |
1113 | if (above) |
1134 | // re-link, make sure compiler can easily use cmove |
1114 | above->below = below; |
1135 | *(above ? &above->below : &ms.top) = below; |
1115 | else |
1136 | *(below ? &below->above : &ms.bot) = above; |
1116 | ms.top = below; /* we were top, set new top */ |
|
|
1117 | |
|
|
1118 | /* Relink the object below us, if there is one */ |
|
|
1119 | if (below) |
|
|
1120 | below->above = above; |
|
|
1121 | else |
|
|
1122 | ms.bot = above; |
|
|
1123 | |
1137 | |
1124 | above = 0; |
1138 | above = 0; |
1125 | below = 0; |
1139 | below = 0; |
1126 | |
1140 | |
|
|
1141 | ms.invalidate (); |
|
|
1142 | |
1127 | if (map->in_memory == MAP_SAVING) |
1143 | if (map->in_memory == MAP_SAVING) |
1128 | return; |
1144 | return; |
1129 | |
1145 | |
1130 | int check_walk_off = !flag [FLAG_NO_APPLY]; |
1146 | int check_walk_off = !flag [FLAG_NO_APPLY]; |
1131 | |
1147 | |
1132 | if (object *pl = ms.player ()) |
1148 | if (object *pl = ms.player ()) |
1133 | { |
1149 | { |
1134 | if (pl->container == this) |
1150 | if (pl->container_ () == this) |
1135 | /* If a container that the player is currently using somehow gets |
1151 | /* If a container that the player is currently using somehow gets |
1136 | * removed (most likely destroyed), update the player view |
1152 | * removed (most likely destroyed), update the player view |
1137 | * appropriately. |
1153 | * appropriately. |
1138 | */ |
1154 | */ |
1139 | pl->close_container (); |
1155 | pl->close_container (); |
… | |
… | |
1143 | //TODO: update floorbox to preserve ordering |
1159 | //TODO: update floorbox to preserve ordering |
1144 | if (pl->contr->ns) |
1160 | if (pl->contr->ns) |
1145 | pl->contr->ns->floorbox_update (); |
1161 | pl->contr->ns->floorbox_update (); |
1146 | } |
1162 | } |
1147 | |
1163 | |
|
|
1164 | if (check_walk_off) |
1148 | for (tmp = ms.bot; tmp; tmp = tmp->above) |
1165 | for (object *above, *tmp = ms.bot; tmp; tmp = above) |
1149 | { |
1166 | { |
|
|
1167 | above = tmp->above; |
|
|
1168 | |
1150 | /* No point updating the players look faces if he is the object |
1169 | /* No point updating the players look faces if he is the object |
1151 | * being removed. |
1170 | * being removed. |
1152 | */ |
1171 | */ |
1153 | |
1172 | |
1154 | /* See if object moving off should effect something */ |
1173 | /* See if object moving off should effect something */ |
1155 | if (check_walk_off |
|
|
1156 | && ((move_type & tmp->move_off) |
1174 | if ((move_type & tmp->move_off) |
1157 | && (move_type & ~tmp->move_off & ~tmp->move_block) == 0)) |
1175 | && (move_type & ~tmp->move_off & ~tmp->move_block) == 0) |
1158 | { |
|
|
1159 | move_apply (tmp, this, 0); |
1176 | move_apply (tmp, this, 0); |
1160 | |
|
|
1161 | if (destroyed ()) |
|
|
1162 | LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ()); |
|
|
1163 | } |
1177 | } |
1164 | |
1178 | |
1165 | last = tmp; |
1179 | if (affects_los ()) |
1166 | } |
|
|
1167 | |
|
|
1168 | /* last == NULL if there are no objects on this space */ |
|
|
1169 | //TODO: this makes little sense, why only update the topmost object? |
|
|
1170 | if (!last) |
|
|
1171 | map->at (x, y).flags_ = 0; |
|
|
1172 | else |
|
|
1173 | update_object (last, UP_OBJ_REMOVE); |
|
|
1174 | |
|
|
1175 | if (flag [FLAG_BLOCKSVIEW] || glow_radius) |
|
|
1176 | update_all_los (map, x, y); |
1180 | update_all_los (map, x, y); |
1177 | } |
1181 | } |
1178 | } |
1182 | } |
1179 | |
1183 | |
1180 | /* |
1184 | /* |
… | |
… | |
1204 | esrv_update_item (UPD_NROF, pl, top); |
1208 | esrv_update_item (UPD_NROF, pl, top); |
1205 | |
1209 | |
1206 | op->weight = 0; // cancel the addition above |
1210 | op->weight = 0; // cancel the addition above |
1207 | op->carrying = 0; // must be 0 already |
1211 | op->carrying = 0; // must be 0 already |
1208 | |
1212 | |
1209 | op->destroy (1); |
1213 | op->destroy (); |
1210 | |
1214 | |
1211 | return top; |
1215 | return top; |
1212 | } |
1216 | } |
1213 | |
1217 | |
1214 | return 0; |
1218 | return 0; |
… | |
… | |
1242 | * job preparing multi-part monsters. |
1246 | * job preparing multi-part monsters. |
1243 | */ |
1247 | */ |
1244 | object * |
1248 | object * |
1245 | insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y) |
1249 | insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y) |
1246 | { |
1250 | { |
|
|
1251 | op->remove (); |
|
|
1252 | |
1247 | for (object *tmp = op->head_ (); tmp; tmp = tmp->more) |
1253 | for (object *tmp = op->head_ (); tmp; tmp = tmp->more) |
1248 | { |
1254 | { |
1249 | tmp->x = x + tmp->arch->x; |
1255 | tmp->x = x + tmp->arch->x; |
1250 | tmp->y = y + tmp->arch->y; |
1256 | tmp->y = y + tmp->arch->y; |
1251 | } |
1257 | } |
… | |
… | |
1274 | * just 'op' otherwise |
1280 | * just 'op' otherwise |
1275 | */ |
1281 | */ |
1276 | object * |
1282 | object * |
1277 | insert_ob_in_map (object *op, maptile *m, object *originator, int flag) |
1283 | insert_ob_in_map (object *op, maptile *m, object *originator, int flag) |
1278 | { |
1284 | { |
1279 | assert (!op->flag [FLAG_FREED]); |
|
|
1280 | |
|
|
1281 | op->remove (); |
1285 | op->remove (); |
|
|
1286 | |
|
|
1287 | if (m == &freed_map)//D TODO: remove soon |
|
|
1288 | {//D |
|
|
1289 | LOG (llevError | logBacktrace, "tries to insret object on freed objects map: %s", op->debug_desc ());//D |
|
|
1290 | }//D |
1282 | |
1291 | |
1283 | /* Ideally, the caller figures this out. However, it complicates a lot |
1292 | /* Ideally, the caller figures this out. However, it complicates a lot |
1284 | * of areas of callers (eg, anything that uses find_free_spot would now |
1293 | * of areas of callers (eg, anything that uses find_free_spot would now |
1285 | * need extra work |
1294 | * need extra work |
1286 | */ |
1295 | */ |
|
|
1296 | maptile *newmap = m; |
1287 | if (!xy_normalise (m, op->x, op->y)) |
1297 | if (!xy_normalise (newmap, op->x, op->y)) |
1288 | { |
1298 | { |
1289 | op->head_ ()->destroy (1);// remove head_ once all tail object destroyers found |
1299 | op->head_ ()->destroy ();// remove head_ once all tail object destroyers found |
1290 | return 0; |
1300 | return 0; |
1291 | } |
1301 | } |
1292 | |
1302 | |
1293 | if (object *more = op->more) |
1303 | if (object *more = op->more) |
1294 | if (!insert_ob_in_map (more, m, originator, flag)) |
1304 | if (!insert_ob_in_map (more, m, originator, flag)) |
1295 | return 0; |
1305 | return 0; |
1296 | |
1306 | |
1297 | CLEAR_FLAG (op, FLAG_REMOVED); |
1307 | op->flag [FLAG_REMOVED] = false; |
1298 | |
1308 | op->env = 0; |
1299 | op->map = m; |
1309 | op->map = newmap; |
|
|
1310 | |
1300 | mapspace &ms = op->ms (); |
1311 | mapspace &ms = op->ms (); |
1301 | |
1312 | |
1302 | /* this has to be done after we translate the coordinates. |
1313 | /* this has to be done after we translate the coordinates. |
1303 | */ |
1314 | */ |
1304 | if (op->nrof && !(flag & INS_NO_MERGE)) |
1315 | if (op->nrof && !(flag & INS_NO_MERGE)) |
1305 | for (object *tmp = ms.bot; tmp; tmp = tmp->above) |
1316 | for (object *tmp = ms.bot; tmp; tmp = tmp->above) |
1306 | if (object::can_merge (op, tmp)) |
1317 | if (object::can_merge (op, tmp)) |
1307 | { |
1318 | { |
1308 | // TODO: we atcually want to update tmp, not op, |
1319 | // TODO: we actually want to update tmp, not op, |
1309 | // but some caller surely breaks when we return tmp |
1320 | // but some caller surely breaks when we return tmp |
1310 | // from here :/ |
1321 | // from here :/ |
1311 | op->nrof += tmp->nrof; |
1322 | op->nrof += tmp->nrof; |
1312 | tmp->destroy (1); |
1323 | tmp->destroy (); |
1313 | } |
1324 | } |
1314 | |
1325 | |
1315 | CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */ |
1326 | CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */ |
1316 | CLEAR_FLAG (op, FLAG_INV_LOCKED); |
1327 | CLEAR_FLAG (op, FLAG_INV_LOCKED); |
1317 | |
1328 | |
… | |
… | |
1324 | { |
1335 | { |
1325 | LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n"); |
1336 | LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n"); |
1326 | abort (); |
1337 | abort (); |
1327 | } |
1338 | } |
1328 | |
1339 | |
|
|
1340 | if (!originator->is_on_map ()) |
|
|
1341 | { |
|
|
1342 | LOG (llevError, "insert_ob_in_map(%s) called with INS_BELOW_ORIGINATOR when originator '%s' not on map", |
|
|
1343 | op->debug_desc (), originator->debug_desc ()); |
|
|
1344 | abort (); |
|
|
1345 | } |
|
|
1346 | |
1329 | op->above = originator; |
1347 | op->above = originator; |
1330 | op->below = originator->below; |
1348 | op->below = originator->below; |
1331 | |
|
|
1332 | if (op->below) |
|
|
1333 | op->below->above = op; |
|
|
1334 | else |
|
|
1335 | ms.bot = op; |
|
|
1336 | |
|
|
1337 | /* since *below* originator, no need to update top */ |
|
|
1338 | originator->below = op; |
1349 | originator->below = op; |
|
|
1350 | |
|
|
1351 | *(op->below ? &op->below->above : &ms.bot) = op; |
1339 | } |
1352 | } |
1340 | else |
1353 | else |
1341 | { |
1354 | { |
1342 | object *top, *floor = NULL; |
1355 | object *floor = 0; |
1343 | |
1356 | object *top = ms.top; |
1344 | top = ms.bot; |
|
|
1345 | |
1357 | |
1346 | /* If there are other objects, then */ |
1358 | /* If there are other objects, then */ |
1347 | if (top) |
1359 | if (top) |
1348 | { |
1360 | { |
1349 | object *last = 0; |
|
|
1350 | |
|
|
1351 | /* |
1361 | /* |
1352 | * If there are multiple objects on this space, we do some trickier handling. |
1362 | * If there are multiple objects on this space, we do some trickier handling. |
1353 | * We've already dealt with merging if appropriate. |
1363 | * We've already dealt with merging if appropriate. |
1354 | * Generally, we want to put the new object on top. But if |
1364 | * Generally, we want to put the new object on top. But if |
1355 | * flag contains INS_ABOVE_FLOOR_ONLY, once we find the last |
1365 | * flag contains INS_ABOVE_FLOOR_ONLY, once we find the last |
… | |
… | |
1358 | * once we get to them. This reduces the need to traverse over all of |
1368 | * once we get to them. This reduces the need to traverse over all of |
1359 | * them when adding another one - this saves quite a bit of cpu time |
1369 | * them when adding another one - this saves quite a bit of cpu time |
1360 | * when lots of spells are cast in one area. Currently, it is presumed |
1370 | * when lots of spells are cast in one area. Currently, it is presumed |
1361 | * that flying non pickable objects are spell objects. |
1371 | * that flying non pickable objects are spell objects. |
1362 | */ |
1372 | */ |
1363 | for (top = ms.bot; top; top = top->above) |
1373 | for (object *tmp = ms.bot; tmp; tmp = tmp->above) |
1364 | { |
1374 | { |
1365 | if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR)) |
1375 | if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) || QUERY_FLAG (tmp, FLAG_OVERLAY_FLOOR)) |
1366 | floor = top; |
1376 | floor = tmp; |
1367 | |
1377 | |
1368 | if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR)) |
1378 | if (QUERY_FLAG (tmp, FLAG_NO_PICK) && (tmp->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (tmp, FLAG_IS_FLOOR)) |
1369 | { |
1379 | { |
1370 | /* We insert above top, so we want this object below this */ |
1380 | /* We insert above top, so we want this object below this */ |
1371 | top = top->below; |
1381 | top = tmp->below; |
1372 | break; |
1382 | break; |
1373 | } |
1383 | } |
1374 | |
1384 | |
1375 | last = top; |
1385 | top = tmp; |
1376 | } |
1386 | } |
1377 | |
|
|
1378 | /* Don't want top to be NULL, so set it to the last valid object */ |
|
|
1379 | top = last; |
|
|
1380 | |
1387 | |
1381 | /* We let update_position deal with figuring out what the space |
1388 | /* We let update_position deal with figuring out what the space |
1382 | * looks like instead of lots of conditions here. |
1389 | * looks like instead of lots of conditions here. |
1383 | * makes things faster, and effectively the same result. |
1390 | * makes things faster, and effectively the same result. |
1384 | */ |
1391 | */ |
… | |
… | |
1391 | */ |
1398 | */ |
1392 | if (!(flag & INS_ON_TOP) |
1399 | if (!(flag & INS_ON_TOP) |
1393 | && ms.flags () & P_BLOCKSVIEW |
1400 | && ms.flags () & P_BLOCKSVIEW |
1394 | && (op->face && !faces [op->face].visibility)) |
1401 | && (op->face && !faces [op->face].visibility)) |
1395 | { |
1402 | { |
|
|
1403 | object *last; |
|
|
1404 | |
1396 | for (last = top; last != floor; last = last->below) |
1405 | for (last = top; last != floor; last = last->below) |
1397 | if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT)) |
1406 | if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT)) |
1398 | break; |
1407 | break; |
1399 | |
1408 | |
1400 | /* Check to see if we found the object that blocks view, |
1409 | /* Check to see if we found the object that blocks view, |
… | |
… | |
1408 | } /* If objects on this space */ |
1417 | } /* If objects on this space */ |
1409 | |
1418 | |
1410 | if (flag & INS_ABOVE_FLOOR_ONLY) |
1419 | if (flag & INS_ABOVE_FLOOR_ONLY) |
1411 | top = floor; |
1420 | top = floor; |
1412 | |
1421 | |
1413 | /* Top is the object that our object (op) is going to get inserted above. |
1422 | // insert object above top, or bottom-most if top = 0 |
1414 | */ |
|
|
1415 | |
|
|
1416 | /* First object on this space */ |
|
|
1417 | if (!top) |
1423 | if (!top) |
1418 | { |
1424 | { |
|
|
1425 | op->below = 0; |
1419 | op->above = ms.bot; |
1426 | op->above = ms.bot; |
1420 | |
|
|
1421 | if (op->above) |
|
|
1422 | op->above->below = op; |
|
|
1423 | |
|
|
1424 | op->below = 0; |
|
|
1425 | ms.bot = op; |
1427 | ms.bot = op; |
|
|
1428 | |
|
|
1429 | *(op->above ? &op->above->below : &ms.top) = op; |
1426 | } |
1430 | } |
1427 | else |
1431 | else |
1428 | { /* get inserted into the stack above top */ |
1432 | { |
1429 | op->above = top->above; |
1433 | op->above = top->above; |
1430 | |
|
|
1431 | if (op->above) |
|
|
1432 | op->above->below = op; |
1434 | top->above = op; |
1433 | |
1435 | |
1434 | op->below = top; |
1436 | op->below = top; |
1435 | top->above = op; |
1437 | *(op->above ? &op->above->below : &ms.top) = op; |
1436 | } |
1438 | } |
|
|
1439 | } |
1437 | |
1440 | |
1438 | if (!op->above) |
1441 | if (op->is_player ()) |
1439 | ms.top = op; |
|
|
1440 | } /* else not INS_BELOW_ORIGINATOR */ |
|
|
1441 | |
|
|
1442 | if (op->type == PLAYER) |
|
|
1443 | { |
1442 | { |
1444 | op->contr->do_los = 1; |
1443 | op->contr->do_los = 1; |
1445 | ++op->map->players; |
1444 | ++op->map->players; |
1446 | op->map->touch (); |
1445 | op->map->touch (); |
1447 | } |
1446 | } |
… | |
… | |
1462 | * be far away from this change and not affected in any way - |
1461 | * be far away from this change and not affected in any way - |
1463 | * this should get redone to only look for players within range, |
1462 | * this should get redone to only look for players within range, |
1464 | * or just updating the P_UPTODATE for spaces within this area |
1463 | * or just updating the P_UPTODATE for spaces within this area |
1465 | * of effect may be sufficient. |
1464 | * of effect may be sufficient. |
1466 | */ |
1465 | */ |
1467 | if (op->map->darkness && (op->glow_radius != 0)) |
1466 | if (op->affects_los ()) |
|
|
1467 | { |
|
|
1468 | op->ms ().invalidate (); |
1468 | update_all_los (op->map, op->x, op->y); |
1469 | update_all_los (op->map, op->x, op->y); |
|
|
1470 | } |
1469 | |
1471 | |
1470 | /* updates flags (blocked, alive, no magic, etc) for this map space */ |
1472 | /* updates flags (blocked, alive, no magic, etc) for this map space */ |
1471 | update_object (op, UP_OBJ_INSERT); |
1473 | update_object (op, UP_OBJ_INSERT); |
1472 | |
1474 | |
1473 | INVOKE_OBJECT (INSERT, op); |
1475 | INVOKE_OBJECT (INSERT, op); |
… | |
… | |
1480 | * blocked() and wall() work properly), and these flags are updated by |
1482 | * blocked() and wall() work properly), and these flags are updated by |
1481 | * update_object(). |
1483 | * update_object(). |
1482 | */ |
1484 | */ |
1483 | |
1485 | |
1484 | /* if this is not the head or flag has been passed, don't check walk on status */ |
1486 | /* if this is not the head or flag has been passed, don't check walk on status */ |
1485 | if (!(flag & INS_NO_WALK_ON) && op->head_ () == op) |
1487 | if (!(flag & INS_NO_WALK_ON) && op->is_head ()) |
1486 | { |
1488 | { |
1487 | if (check_move_on (op, originator)) |
1489 | if (check_move_on (op, originator)) |
1488 | return 0; |
1490 | return 0; |
1489 | |
1491 | |
1490 | /* If we are a multi part object, lets work our way through the check |
1492 | /* If we are a multi part object, lets work our way through the check |
… | |
… | |
1501 | /* this function inserts an object in the map, but if it |
1503 | /* this function inserts an object in the map, but if it |
1502 | * finds an object of its own type, it'll remove that one first. |
1504 | * finds an object of its own type, it'll remove that one first. |
1503 | * op is the object to insert it under: supplies x and the map. |
1505 | * op is the object to insert it under: supplies x and the map. |
1504 | */ |
1506 | */ |
1505 | void |
1507 | void |
1506 | replace_insert_ob_in_map (const char *arch_string, object *op) |
1508 | replace_insert_ob_in_map (shstr_tmp archname, object *op) |
1507 | { |
1509 | { |
1508 | /* first search for itself and remove any old instances */ |
1510 | /* first search for itself and remove any old instances */ |
1509 | |
1511 | |
1510 | for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above) |
1512 | for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above) |
1511 | if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */ |
1513 | if (tmp->arch->archname == archname) /* same archetype */ |
1512 | tmp->destroy (1); |
1514 | tmp->destroy (); |
1513 | |
1515 | |
1514 | object *tmp = arch_to_object (archetype::find (arch_string)); |
1516 | object *tmp = arch_to_object (archetype::find (archname)); |
1515 | |
1517 | |
1516 | tmp->x = op->x; |
1518 | tmp->x = op->x; |
1517 | tmp->y = op->y; |
1519 | tmp->y = op->y; |
1518 | |
1520 | |
1519 | insert_ob_in_map (tmp, op->map, op, 0); |
1521 | insert_ob_in_map (tmp, op->map, op, 0); |
… | |
… | |
1541 | if (!nr) |
1543 | if (!nr) |
1542 | return true; |
1544 | return true; |
1543 | |
1545 | |
1544 | nr = min (nr, nrof); |
1546 | nr = min (nr, nrof); |
1545 | |
1547 | |
|
|
1548 | if (nrof > nr) |
|
|
1549 | { |
1546 | nrof -= nr; |
1550 | nrof -= nr; |
1547 | |
|
|
1548 | if (nrof) |
|
|
1549 | { |
|
|
1550 | adjust_weight (env, -weight * nr); // carrying == 0 |
1551 | adjust_weight (env, -weight * max (1, nr)); // carrying == 0 |
1551 | |
1552 | |
1552 | if (object *pl = visible_to ()) |
1553 | if (object *pl = visible_to ()) |
1553 | esrv_update_item (UPD_NROF, pl, this); |
1554 | esrv_update_item (UPD_NROF, pl, this); |
1554 | |
1555 | |
1555 | return true; |
1556 | return true; |
1556 | } |
1557 | } |
1557 | else |
1558 | else |
1558 | { |
1559 | { |
1559 | destroy (1); |
1560 | destroy (); |
1560 | return false; |
1561 | return false; |
1561 | } |
1562 | } |
1562 | } |
1563 | } |
1563 | |
1564 | |
1564 | /* |
1565 | /* |
… | |
… | |
1641 | if (object *pl = tmp->visible_to ()) |
1642 | if (object *pl = tmp->visible_to ()) |
1642 | esrv_update_item (UPD_NROF, pl, tmp); |
1643 | esrv_update_item (UPD_NROF, pl, tmp); |
1643 | |
1644 | |
1644 | adjust_weight (this, op->total_weight ()); |
1645 | adjust_weight (this, op->total_weight ()); |
1645 | |
1646 | |
1646 | op->destroy (1); |
1647 | op->destroy (); |
1647 | op = tmp; |
1648 | op = tmp; |
1648 | goto inserted; |
1649 | goto inserted; |
1649 | } |
1650 | } |
1650 | |
1651 | |
1651 | op->owner = 0; // it's his/hers now. period. |
1652 | op->owner = 0; // it's his/hers now. period. |
… | |
… | |
1669 | |
1670 | |
1670 | adjust_weight (this, op->total_weight ()); |
1671 | adjust_weight (this, op->total_weight ()); |
1671 | |
1672 | |
1672 | inserted: |
1673 | inserted: |
1673 | /* reset the light list and los of the players on the map */ |
1674 | /* reset the light list and los of the players on the map */ |
1674 | if (op->glow_radius && map && map->darkness) |
1675 | if (op->glow_radius && is_on_map ()) |
|
|
1676 | { |
|
|
1677 | update_stats (); |
1675 | update_all_los (map, x, y); |
1678 | update_all_los (map, x, y); |
1676 | |
1679 | } |
|
|
1680 | else if (is_player () && !flag [FLAG_NO_FIX_PLAYER]) |
1677 | // if this is a player's inventory, update stats |
1681 | // if this is a player's inventory, update stats |
1678 | if (type == PLAYER && !flag [FLAG_NO_FIX_PLAYER]) |
|
|
1679 | update_stats (); |
1682 | update_stats (); |
1680 | |
1683 | |
1681 | INVOKE_OBJECT (INSERT, this); |
1684 | INVOKE_OBJECT (INSERT, this); |
1682 | |
1685 | |
1683 | return op; |
1686 | return op; |
… | |
… | |
1704 | * on top. |
1707 | * on top. |
1705 | */ |
1708 | */ |
1706 | int |
1709 | int |
1707 | check_move_on (object *op, object *originator) |
1710 | check_move_on (object *op, object *originator) |
1708 | { |
1711 | { |
|
|
1712 | if (QUERY_FLAG (op, FLAG_NO_APPLY)) |
|
|
1713 | return 0; |
|
|
1714 | |
1709 | object *tmp; |
1715 | object *tmp; |
1710 | maptile *m = op->map; |
1716 | maptile *m = op->map; |
1711 | int x = op->x, y = op->y; |
1717 | int x = op->x, y = op->y; |
1712 | |
1718 | |
1713 | MoveType move_on, move_slow, move_block; |
1719 | mapspace &ms = m->at (x, y); |
1714 | |
1720 | |
1715 | if (QUERY_FLAG (op, FLAG_NO_APPLY)) |
1721 | ms.update (); |
1716 | return 0; |
|
|
1717 | |
1722 | |
1718 | move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y); |
1723 | MoveType move_on = ms.move_on; |
1719 | move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y); |
1724 | MoveType move_slow = ms.move_slow; |
1720 | move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y); |
1725 | MoveType move_block = ms.move_block; |
1721 | |
1726 | |
1722 | /* if nothing on this space will slow op down or be applied, |
1727 | /* if nothing on this space will slow op down or be applied, |
1723 | * no need to do checking below. have to make sure move_type |
1728 | * no need to do checking below. have to make sure move_type |
1724 | * is set, as lots of objects don't have it set - we treat that |
1729 | * is set, as lots of objects don't have it set - we treat that |
1725 | * as walking. |
1730 | * as walking. |
… | |
… | |
1736 | return 0; |
1741 | return 0; |
1737 | |
1742 | |
1738 | /* The objects have to be checked from top to bottom. |
1743 | /* The objects have to be checked from top to bottom. |
1739 | * Hence, we first go to the top: |
1744 | * Hence, we first go to the top: |
1740 | */ |
1745 | */ |
1741 | |
1746 | for (object *next, *tmp = ms.top; tmp; tmp = next) |
1742 | for (tmp = op->ms ().bot; tmp && tmp->above; tmp = tmp->above) |
|
|
1743 | { |
|
|
1744 | /* Trim the search when we find the first other spell effect |
|
|
1745 | * this helps performance so that if a space has 50 spell objects, |
|
|
1746 | * we don't need to check all of them. |
|
|
1747 | */ |
|
|
1748 | if ((tmp->move_type & MOVE_FLY_LOW) && QUERY_FLAG (tmp, FLAG_NO_PICK)) |
|
|
1749 | break; |
|
|
1750 | } |
1747 | { |
|
|
1748 | next = tmp->below; |
1751 | |
1749 | |
1752 | for (; tmp; tmp = tmp->below) |
|
|
1753 | { |
|
|
1754 | if (tmp == op) |
1750 | if (tmp == op) |
1755 | continue; /* Can't apply yourself */ |
1751 | continue; /* Can't apply yourself */ |
1756 | |
1752 | |
1757 | /* Check to see if one of the movement types should be slowed down. |
1753 | /* Check to see if one of the movement types should be slowed down. |
1758 | * Second check makes sure that the movement types not being slowed |
1754 | * Second check makes sure that the movement types not being slowed |
… | |
… | |
1763 | if (!QUERY_FLAG (op, FLAG_WIZPASS)) |
1759 | if (!QUERY_FLAG (op, FLAG_WIZPASS)) |
1764 | { |
1760 | { |
1765 | if ((!op->move_type && tmp->move_slow & MOVE_WALK) || |
1761 | if ((!op->move_type && tmp->move_slow & MOVE_WALK) || |
1766 | ((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0)) |
1762 | ((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0)) |
1767 | { |
1763 | { |
1768 | |
|
|
1769 | float |
|
|
1770 | diff = tmp->move_slow_penalty * fabs (op->speed); |
1764 | float diff = tmp->move_slow_penalty * fabs (op->speed); |
1771 | |
1765 | |
1772 | if (op->type == PLAYER) |
1766 | if (op->is_player ()) |
1773 | if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) || |
1767 | if ((tmp->flag [FLAG_IS_HILLY ] && find_skill_by_number (op, SK_CLIMBING)) || |
1774 | (QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN))) |
1768 | (tmp->flag [FLAG_IS_WOODED] && find_skill_by_number (op, SK_WOODSMAN))) |
1775 | diff /= 4.0; |
1769 | diff /= 4.0; |
1776 | |
1770 | |
1777 | op->speed_left -= diff; |
1771 | op->speed_left -= diff; |
1778 | } |
1772 | } |
1779 | } |
1773 | } |
… | |
… | |
1985 | * head of the object should correspond for the entire object. |
1979 | * head of the object should correspond for the entire object. |
1986 | */ |
1980 | */ |
1987 | if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block)) |
1981 | if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block)) |
1988 | continue; |
1982 | continue; |
1989 | |
1983 | |
1990 | if (ob->blocked (m, pos.x, pos.y)) |
1984 | if (ob->blocked (pos.m, pos.x, pos.y)) |
1991 | continue; |
1985 | continue; |
1992 | |
1986 | |
1993 | altern [index++] = i; |
1987 | altern [index++] = i; |
1994 | } |
1988 | } |
1995 | |
1989 | |
… | |
… | |
2063 | * there is capable of. |
2057 | * there is capable of. |
2064 | */ |
2058 | */ |
2065 | int |
2059 | int |
2066 | find_dir (maptile *m, int x, int y, object *exclude) |
2060 | find_dir (maptile *m, int x, int y, object *exclude) |
2067 | { |
2061 | { |
2068 | int i, max = SIZEOFFREE, mflags; |
2062 | int max = SIZEOFFREE, mflags; |
2069 | |
|
|
2070 | sint16 nx, ny; |
|
|
2071 | object *tmp; |
|
|
2072 | maptile *mp; |
|
|
2073 | |
|
|
2074 | MoveType blocked, move_type; |
2063 | MoveType move_type; |
2075 | |
2064 | |
2076 | if (exclude && exclude->head_ () != exclude) |
2065 | if (exclude && exclude->head_ () != exclude) |
2077 | { |
2066 | { |
2078 | exclude = exclude->head; |
2067 | exclude = exclude->head; |
2079 | move_type = exclude->move_type; |
2068 | move_type = exclude->move_type; |
… | |
… | |
2082 | { |
2071 | { |
2083 | /* If we don't have anything, presume it can use all movement types. */ |
2072 | /* If we don't have anything, presume it can use all movement types. */ |
2084 | move_type = MOVE_ALL; |
2073 | move_type = MOVE_ALL; |
2085 | } |
2074 | } |
2086 | |
2075 | |
2087 | for (i = 1; i < max; i++) |
2076 | for (int i = 1; i < max; i++) |
2088 | { |
2077 | { |
2089 | mp = m; |
2078 | mapxy pos (m, x, y); |
2090 | nx = x + freearr_x[i]; |
2079 | pos.move (i); |
2091 | ny = y + freearr_y[i]; |
|
|
2092 | |
2080 | |
2093 | mflags = get_map_flags (m, &mp, nx, ny, &nx, &ny); |
2081 | if (!pos.normalise ()) |
2094 | |
|
|
2095 | if (mflags & P_OUT_OF_MAP) |
|
|
2096 | max = maxfree[i]; |
2082 | max = maxfree[i]; |
2097 | else |
2083 | else |
2098 | { |
2084 | { |
2099 | mapspace &ms = mp->at (nx, ny); |
2085 | mapspace &ms = *pos; |
2100 | |
2086 | |
2101 | blocked = ms.move_block; |
|
|
2102 | |
|
|
2103 | if ((move_type & blocked) == move_type) |
2087 | if ((move_type & ms.move_block) == move_type) |
2104 | max = maxfree[i]; |
2088 | max = maxfree [i]; |
2105 | else if (mflags & P_IS_ALIVE) |
2089 | else if (ms.flags () & P_IS_ALIVE) |
2106 | { |
2090 | { |
2107 | for (tmp = ms.bot; tmp; tmp = tmp->above) |
2091 | for (object *tmp = ms.bot; tmp; tmp = tmp->above) |
2108 | if ((tmp->flag [FLAG_MONSTER] || tmp->type == PLAYER) |
2092 | if ((tmp->flag [FLAG_MONSTER] || tmp->is_player ()) |
2109 | && (tmp != exclude || (tmp->head_ () != tmp && tmp->head_ () != exclude))) |
2093 | && (tmp != exclude || (tmp->head_ () != tmp && tmp->head_ () != exclude))) |
2110 | break; |
|
|
2111 | |
|
|
2112 | if (tmp) |
|
|
2113 | return freedir[i]; |
2094 | return freedir [i]; |
2114 | } |
2095 | } |
2115 | } |
2096 | } |
2116 | } |
2097 | } |
2117 | |
2098 | |
2118 | return 0; |
2099 | return 0; |
… | |
… | |
2193 | * This basically means that if direction is 15, then it could either go |
2174 | * This basically means that if direction is 15, then it could either go |
2194 | * direction 4, 14, or 16 to get back to where we are. |
2175 | * direction 4, 14, or 16 to get back to where we are. |
2195 | * Moved from spell_util.c to object.c with the other related direction |
2176 | * Moved from spell_util.c to object.c with the other related direction |
2196 | * functions. |
2177 | * functions. |
2197 | */ |
2178 | */ |
2198 | int reduction_dir[SIZEOFFREE][3] = { |
2179 | static const int reduction_dir[SIZEOFFREE][3] = { |
2199 | {0, 0, 0}, /* 0 */ |
2180 | {0, 0, 0}, /* 0 */ |
2200 | {0, 0, 0}, /* 1 */ |
2181 | {0, 0, 0}, /* 1 */ |
2201 | {0, 0, 0}, /* 2 */ |
2182 | {0, 0, 0}, /* 2 */ |
2202 | {0, 0, 0}, /* 3 */ |
2183 | {0, 0, 0}, /* 3 */ |
2203 | {0, 0, 0}, /* 4 */ |
2184 | {0, 0, 0}, /* 4 */ |
… | |
… | |
2299 | int |
2280 | int |
2300 | can_pick (const object *who, const object *item) |
2281 | can_pick (const object *who, const object *item) |
2301 | { |
2282 | { |
2302 | return /*QUERY_FLAG(who,FLAG_WIZ)|| */ |
2283 | return /*QUERY_FLAG(who,FLAG_WIZ)|| */ |
2303 | (item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) && |
2284 | (item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) && |
2304 | !QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->type == PLAYER || item->weight < who->weight / 3)); |
2285 | !QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->is_player () || item->weight < who->weight / 3)); |
2305 | } |
2286 | } |
2306 | |
2287 | |
2307 | /* |
2288 | /* |
2308 | * create clone from object to another |
2289 | * create clone from object to another |
2309 | */ |
2290 | */ |
… | |
… | |
2341 | return tmp; |
2322 | return tmp; |
2342 | |
2323 | |
2343 | return 0; |
2324 | return 0; |
2344 | } |
2325 | } |
2345 | |
2326 | |
2346 | const shstr & |
2327 | shstr_tmp |
2347 | object::kv_get (const shstr &key) const |
2328 | object::kv_get (shstr_tmp key) const |
2348 | { |
2329 | { |
2349 | for (key_value *kv = key_values; kv; kv = kv->next) |
2330 | for (key_value *kv = key_values; kv; kv = kv->next) |
2350 | if (kv->key == key) |
2331 | if (kv->key == key) |
2351 | return kv->value; |
2332 | return kv->value; |
2352 | |
2333 | |
2353 | return shstr_null; |
2334 | return shstr (); |
2354 | } |
2335 | } |
2355 | |
2336 | |
2356 | void |
2337 | void |
2357 | object::kv_set (const shstr &key, const shstr &value) |
2338 | object::kv_set (shstr_tmp key, shstr_tmp value) |
2358 | { |
2339 | { |
2359 | for (key_value *kv = key_values; kv; kv = kv->next) |
2340 | for (key_value *kv = key_values; kv; kv = kv->next) |
2360 | if (kv->key == key) |
2341 | if (kv->key == key) |
2361 | { |
2342 | { |
2362 | kv->value = value; |
2343 | kv->value = value; |
… | |
… | |
2371 | |
2352 | |
2372 | key_values = kv; |
2353 | key_values = kv; |
2373 | } |
2354 | } |
2374 | |
2355 | |
2375 | void |
2356 | void |
2376 | object::kv_del (const shstr &key) |
2357 | object::kv_del (shstr_tmp key) |
2377 | { |
2358 | { |
2378 | for (key_value **kvp = &key_values; *kvp; kvp = &(*kvp)->next) |
2359 | for (key_value **kvp = &key_values; *kvp; kvp = &(*kvp)->next) |
2379 | if ((*kvp)->key == key) |
2360 | if ((*kvp)->key == key) |
2380 | { |
2361 | { |
2381 | key_value *kv = *kvp; |
2362 | key_value *kv = *kvp; |
… | |
… | |
2440 | { |
2421 | { |
2441 | char flagdesc[512]; |
2422 | char flagdesc[512]; |
2442 | char info2[256 * 4]; |
2423 | char info2[256 * 4]; |
2443 | char *p = info; |
2424 | char *p = info; |
2444 | |
2425 | |
2445 | p += snprintf (p, 512, "{cnt:%d,uuid:%s,name:\"%s\"%s%s,flags:[%s],type:%d}", |
2426 | p += snprintf (p, 512, "{cnt:%d,uuid:%s,name:\"%s\"%s%s%s,flags:[%s],type:%d}", |
2446 | count, |
2427 | count, |
2447 | uuid.c_str (), |
2428 | uuid.c_str (), |
2448 | &name, |
2429 | &name, |
2449 | title ? "\",title:\"" : "", |
2430 | title ? ",title:\"" : "", |
2450 | title ? (const char *)title : "", |
2431 | title ? (const char *)title : "", |
|
|
2432 | title ? "\"" : "", |
2451 | flag_desc (flagdesc, 512), type); |
2433 | flag_desc (flagdesc, 512), type); |
2452 | |
2434 | |
2453 | if (!flag[FLAG_REMOVED] && env) |
2435 | if (!flag[FLAG_REMOVED] && env) |
2454 | p += snprintf (p, 256, "(in %s)", env->debug_desc (info2)); |
2436 | p += snprintf (p, 256, "(in %s)", env->debug_desc (info2)); |
2455 | |
2437 | |
… | |
… | |
2511 | container = 0; |
2493 | container = 0; |
2512 | |
2494 | |
2513 | // client needs item update to make it work, client bug requires this to be separate |
2495 | // client needs item update to make it work, client bug requires this to be separate |
2514 | esrv_update_item (UPD_FLAGS, this, old_container); |
2496 | esrv_update_item (UPD_FLAGS, this, old_container); |
2515 | |
2497 | |
2516 | new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container)); |
2498 | new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", old_container->query_name ()); |
2517 | play_sound (sound_find ("chest_close")); |
2499 | play_sound (sound_find ("chest_close")); |
2518 | } |
2500 | } |
2519 | |
2501 | |
2520 | if (new_container) |
2502 | if (new_container) |
2521 | { |
2503 | { |
… | |
… | |
2531 | closer->flag [FLAG_NO_MAP_SAVE] = 1; |
2513 | closer->flag [FLAG_NO_MAP_SAVE] = 1; |
2532 | new_container->insert (closer); |
2514 | new_container->insert (closer); |
2533 | } |
2515 | } |
2534 | #endif |
2516 | #endif |
2535 | |
2517 | |
2536 | new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container)); |
2518 | new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", new_container->query_name ()); |
2537 | |
2519 | |
2538 | // make sure the container is available, client bug requires this to be separate |
2520 | // make sure the container is available, client bug requires this to be separate |
2539 | esrv_send_item (this, new_container); |
2521 | esrv_send_item (this, new_container); |
2540 | |
2522 | |
2541 | new_container->flag [FLAG_APPLIED] = true; |
2523 | new_container->flag [FLAG_APPLIED] = true; |
… | |
… | |
2549 | // else if (!old_container->env && contr && contr->ns) |
2531 | // else if (!old_container->env && contr && contr->ns) |
2550 | // contr->ns->floorbox_reset (); |
2532 | // contr->ns->floorbox_reset (); |
2551 | } |
2533 | } |
2552 | |
2534 | |
2553 | object * |
2535 | object * |
2554 | object::force_find (const shstr name) |
2536 | object::force_find (shstr_tmp name) |
2555 | { |
2537 | { |
2556 | /* cycle through his inventory to look for the MARK we want to |
2538 | /* cycle through his inventory to look for the MARK we want to |
2557 | * place |
2539 | * place |
2558 | */ |
2540 | */ |
2559 | for (object *tmp = inv; tmp; tmp = tmp->below) |
2541 | for (object *tmp = inv; tmp; tmp = tmp->below) |
… | |
… | |
2561 | return splay (tmp); |
2543 | return splay (tmp); |
2562 | |
2544 | |
2563 | return 0; |
2545 | return 0; |
2564 | } |
2546 | } |
2565 | |
2547 | |
|
|
2548 | //-GPL |
|
|
2549 | |
2566 | void |
2550 | void |
|
|
2551 | object::force_set_timer (int duration) |
|
|
2552 | { |
|
|
2553 | this->duration = 1; |
|
|
2554 | this->speed_left = -1.f; |
|
|
2555 | |
|
|
2556 | this->set_speed (duration ? 1.f / duration : 0.f); |
|
|
2557 | } |
|
|
2558 | |
|
|
2559 | object * |
2567 | object::force_add (const shstr name, int duration) |
2560 | object::force_add (shstr_tmp name, int duration) |
2568 | { |
2561 | { |
2569 | if (object *force = force_find (name)) |
2562 | if (object *force = force_find (name)) |
2570 | force->destroy (); |
2563 | force->destroy (); |
2571 | |
2564 | |
2572 | object *force = get_archetype (FORCE_NAME); |
2565 | object *force = get_archetype (FORCE_NAME); |
2573 | |
2566 | |
2574 | force->slaying = name; |
2567 | force->slaying = name; |
2575 | force->stats.food = 1; |
2568 | force->force_set_timer (duration); |
2576 | force->speed_left = -1.f; |
|
|
2577 | |
|
|
2578 | force->set_speed (duration ? 1.f / duration : 0.f); |
|
|
2579 | force->flag [FLAG_IS_USED_UP] = true; |
|
|
2580 | force->flag [FLAG_APPLIED] = true; |
2569 | force->flag [FLAG_APPLIED] = true; |
2581 | |
2570 | |
2582 | insert (force); |
2571 | return insert (force); |
2583 | } |
2572 | } |
2584 | |
2573 | |
2585 | void |
2574 | void |
2586 | object::play_sound (faceidx sound) |
2575 | object::play_sound (faceidx sound) const |
2587 | { |
2576 | { |
2588 | if (!sound) |
2577 | if (!sound) |
2589 | return; |
2578 | return; |
2590 | |
2579 | |
2591 | if (flag [FLAG_REMOVED]) |
2580 | if (is_on_map ()) |
|
|
2581 | map->play_sound (sound, x, y); |
|
|
2582 | else if (object *pl = in_player ()) |
|
|
2583 | pl->contr->play_sound (sound); |
|
|
2584 | } |
|
|
2585 | |
|
|
2586 | void |
|
|
2587 | object::say_msg (const char *msg) const |
|
|
2588 | { |
|
|
2589 | if (is_on_map ()) |
|
|
2590 | map->say_msg (msg, x, y); |
|
|
2591 | else if (object *pl = in_player ()) |
|
|
2592 | pl->contr->play_sound (sound); |
|
|
2593 | } |
|
|
2594 | |
|
|
2595 | void |
|
|
2596 | object::make_noise () |
|
|
2597 | { |
|
|
2598 | // we do not model noise in the map, so instead put |
|
|
2599 | // a temporary light into the noise source |
|
|
2600 | // could use the map instead, but that's less reliable for our |
|
|
2601 | // goal, which is to make invisibility a bit harder to exploit |
|
|
2602 | |
|
|
2603 | // currently only works sensibly for players |
|
|
2604 | if (!is_player ()) |
2592 | return; |
2605 | return; |
2593 | |
2606 | |
2594 | if (env) |
2607 | // find old force, or create new one |
2595 | { |
2608 | object *force = force_find (shstr_noise_force); |
2596 | if (object *pl = in_player ()) |
2609 | |
2597 | pl->contr->play_sound (sound); |
2610 | if (force) |
2598 | } |
2611 | force->speed_left = -1.f; // patch old speed up |
2599 | else |
2612 | else |
2600 | map->play_sound (sound, x, y); |
2613 | { |
2601 | } |
2614 | force = archetype::get (shstr_noise_force); |
2602 | |
2615 | |
|
|
2616 | force->slaying = shstr_noise_force; |
|
|
2617 | force->stats.food = 1; |
|
|
2618 | force->speed_left = -1.f; |
|
|
2619 | |
|
|
2620 | force->set_speed (1.f / 4.f); |
|
|
2621 | force->flag [FLAG_IS_USED_UP] = true; |
|
|
2622 | force->flag [FLAG_APPLIED] = true; |
|
|
2623 | |
|
|
2624 | insert (force); |
|
|
2625 | } |
|
|
2626 | } |
|
|
2627 | |