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 | { |
… | |
… | |
181 | bool object::can_merge_slow (object *ob1, object *ob2) |
186 | bool object::can_merge_slow (object *ob1, object *ob2) |
182 | { |
187 | { |
183 | /* A couple quicksanity checks */ |
188 | /* A couple quicksanity checks */ |
184 | if (ob1 == ob2 |
189 | if (ob1 == ob2 |
185 | || ob1->type != ob2->type |
190 | || ob1->type != ob2->type |
186 | || ob1->speed != ob2->speed |
191 | || fabs (ob1->speed - ob2->speed) >= MIN_ACTIVE_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, assume nrof |
196 | /* Do not merge objects if nrof would overflow, assume nrof |
… | |
… | |
225 | || ob1->move_block != ob2->move_block |
230 | || ob1->move_block != ob2->move_block |
226 | || ob1->move_allow != ob2->move_allow |
231 | || ob1->move_allow != ob2->move_allow |
227 | || ob1->move_on != ob2->move_on |
232 | || ob1->move_on != ob2->move_on |
228 | || ob1->move_off != ob2->move_off |
233 | || ob1->move_off != ob2->move_off |
229 | || ob1->move_slow != ob2->move_slow |
234 | || ob1->move_slow != ob2->move_slow |
230 | || ob1->move_slow_penalty != ob2->move_slow_penalty |
235 | || fabs (ob1->move_slow_penalty - ob2->move_slow_penalty) >= (1.f / 1024.f) |
231 | || memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist)) |
236 | || memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist)) |
232 | || memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats))) |
237 | || memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats))) |
233 | return 0; |
238 | return 0; |
234 | |
239 | |
235 | if ((ob1->flag ^ ob2->flag) |
240 | if ((ob1->flag ^ ob2->flag) |
… | |
… | |
323 | { |
328 | { |
324 | // see if we are in a container of sorts |
329 | // see if we are in a container of sorts |
325 | if (env) |
330 | if (env) |
326 | { |
331 | { |
327 | // the player inventory itself is always visible |
332 | // the player inventory itself is always visible |
328 | if (env->type == PLAYER) |
333 | if (env->is_player ()) |
329 | return env; |
334 | return env; |
330 | |
335 | |
331 | // else a player could have our env open |
336 | // else a player could have our env open |
332 | object *envest = env->outer_env (); |
337 | object *envest = env->outer_env_or_self (); |
333 | |
338 | |
334 | // 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 |
335 | // even if our inv is in a player. |
340 | // even if our inv is in a player. |
336 | if (envest->is_on_map ()) |
341 | if (envest->is_on_map ()) |
337 | if (object *pl = envest->ms ().player ()) |
342 | if (object *pl = envest->ms ().player ()) |
338 | if (pl->container == env) |
343 | if (pl->container_ () == env) |
339 | return pl; |
344 | return pl; |
340 | } |
345 | } |
341 | else |
346 | else |
342 | { |
347 | { |
343 | // maybe there is a player standing on the same mapspace |
348 | // maybe there is a player standing on the same mapspace |
344 | // this will catch the case where "this" is a player |
349 | // this will catch the case where "this" is a player |
345 | if (object *pl = ms ().player ()) |
350 | if (object *pl = ms ().player ()) |
346 | if ((!pl->container && pl->contr->ns && !pl->contr->ns->update_look) |
351 | if ((pl->contr->ns && !pl->container_ () && !pl->contr->ns->update_look) |
347 | || this == pl->container) |
352 | || pl->container_ () == this) |
348 | return pl; |
353 | return pl; |
349 | } |
354 | } |
350 | } |
355 | } |
351 | |
356 | |
352 | return 0; |
357 | return 0; |
… | |
… | |
430 | object_freezer freezer; |
435 | object_freezer freezer; |
431 | op->write (freezer); |
436 | op->write (freezer); |
432 | return freezer.as_string (); |
437 | return freezer.as_string (); |
433 | } |
438 | } |
434 | |
439 | |
435 | /* |
440 | char * |
436 | * get_nearest_part(multi-object, object 2) returns the part of the |
441 | object::as_string () |
437 | * multi-object 1 which is closest to the second object. |
|
|
438 | * If it's not a multi-object, it is returned. |
|
|
439 | */ |
|
|
440 | object * |
|
|
441 | get_nearest_part (object *op, const object *pl) |
|
|
442 | { |
442 | { |
443 | object *tmp, *closest; |
443 | return dump_object (this); |
444 | int last_dist, i; |
|
|
445 | |
|
|
446 | if (!op->more) |
|
|
447 | return op; |
|
|
448 | |
|
|
449 | for (last_dist = distance (op, pl), closest = op, tmp = op->more; |
|
|
450 | tmp; |
|
|
451 | tmp = tmp->more) |
|
|
452 | if ((i = distance (tmp, pl)) < last_dist) |
|
|
453 | closest = tmp, last_dist = i; |
|
|
454 | |
|
|
455 | return closest; |
|
|
456 | } |
444 | } |
457 | |
445 | |
458 | /* |
446 | /* |
459 | * Returns the object which has the count-variable equal to the argument. |
447 | * Returns the object which has the count-variable equal to the argument. |
460 | * VERRRY slow. |
448 | * VERRRY slow. |
… | |
… | |
554 | update_stats (); |
542 | update_stats (); |
555 | |
543 | |
556 | new_draw_info_format (NDI_UNIQUE, 0, this, |
544 | new_draw_info_format (NDI_UNIQUE, 0, this, |
557 | "You try to balance all your items at once, " |
545 | "You try to balance all your items at once, " |
558 | "but the %s is just too much for your body. " |
546 | "but the %s is just too much for your body. " |
559 | "[You need to unapply some items first.]", &ob->name); |
547 | "[You need to unapply some items first - use the 'body' command to see " |
|
|
548 | "how many items you cna wera on a specific body part.]", &ob->name); |
560 | return false; |
549 | return false; |
561 | } |
550 | } |
562 | |
551 | |
563 | //new_draw_info_format (NDI_UNIQUE, 0, this, "You switch to your %s.", &ob->name); |
552 | //new_draw_info_format (NDI_UNIQUE, 0, this, "You switch to your %s.", &ob->name); |
564 | } |
553 | } |
… | |
… | |
690 | * This function needs to be called whenever the speed of an object changes. |
679 | * This function needs to be called whenever the speed of an object changes. |
691 | */ |
680 | */ |
692 | void |
681 | void |
693 | object::set_speed (float speed) |
682 | object::set_speed (float speed) |
694 | { |
683 | { |
695 | if (flag [FLAG_FREED] && speed) |
|
|
696 | { |
|
|
697 | LOG (llevError, "Object %s is freed but has speed.\n", &name); |
|
|
698 | speed = 0; |
|
|
699 | } |
|
|
700 | |
|
|
701 | this->speed = speed; |
684 | this->speed = speed; |
702 | |
685 | |
703 | if (has_active_speed ()) |
686 | if (has_active_speed ()) |
704 | activate (); |
687 | activate (); |
705 | else |
688 | else |
… | |
… | |
755 | |
738 | |
756 | if (!(m.flags_ & P_UPTODATE)) |
739 | if (!(m.flags_ & P_UPTODATE)) |
757 | /* nop */; |
740 | /* nop */; |
758 | else if (action == UP_OBJ_INSERT) |
741 | else if (action == UP_OBJ_INSERT) |
759 | { |
742 | { |
|
|
743 | #if 0 |
760 | // this is likely overkill, TODO: revisit (schmorp) |
744 | // this is likely overkill, TODO: revisit (schmorp) |
761 | if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW)) |
745 | if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW)) |
762 | || (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC)) |
746 | || (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC)) |
763 | || (op->type == PLAYER && !(m.flags_ & P_PLAYER)) |
747 | || (op->is_player () && !(m.flags_ & P_PLAYER)) |
764 | || (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE)) |
748 | || (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE)) |
765 | || (QUERY_FLAG (op, FLAG_ALIVE) && !(m.flags_ & P_IS_ALIVE)) |
749 | || (QUERY_FLAG (op, FLAG_ALIVE) && !(m.flags_ & P_IS_ALIVE)) |
766 | || (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC)) |
750 | || (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC)) |
767 | || (m.move_on | op->move_on ) != m.move_on |
751 | || (m.move_on | op->move_on ) != m.move_on |
768 | || (m.move_off | op->move_off ) != m.move_off |
752 | || (m.move_off | op->move_off ) != m.move_off |
769 | || (m.move_slow | op->move_slow) != m.move_slow |
753 | || (m.move_slow | op->move_slow) != m.move_slow |
770 | /* This isn't perfect, but I don't expect a lot of objects to |
754 | /* This isn't perfect, but I don't expect a lot of objects to |
771 | * have move_allow right now. |
755 | * have move_allow right now. |
772 | */ |
756 | */ |
773 | || ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block |
757 | || ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block |
774 | || 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp) |
|
|
775 | m.invalidate (); |
758 | m.invalidate (); |
|
|
759 | #else |
|
|
760 | // the above is not strong enough a test to skip updating. los maybe? TODO (schmorp) |
|
|
761 | m.invalidate (); |
|
|
762 | #endif |
776 | } |
763 | } |
777 | /* if the object is being removed, we can't make intelligent |
764 | /* if the object is being removed, we can't make intelligent |
778 | * decisions, because remove_ob can't really pass the object |
765 | * decisions, because remove_ob can't really pass the object |
779 | * that is being removed. |
766 | * that is being removed. |
780 | */ |
767 | */ |
… | |
… | |
791 | |
778 | |
792 | object::object () |
779 | object::object () |
793 | { |
780 | { |
794 | SET_FLAG (this, FLAG_REMOVED); |
781 | SET_FLAG (this, FLAG_REMOVED); |
795 | |
782 | |
796 | expmul = 1.0; |
783 | //expmul = 1.0; declared const for the time being |
797 | face = blank_face; |
784 | face = blank_face; |
798 | } |
785 | } |
799 | |
786 | |
800 | object::~object () |
787 | object::~object () |
801 | { |
788 | { |
… | |
… | |
830 | { |
817 | { |
831 | /* If already on active list, don't do anything */ |
818 | /* If already on active list, don't do anything */ |
832 | if (active) |
819 | if (active) |
833 | return; |
820 | return; |
834 | |
821 | |
835 | if (has_active_speed () && flag [FLAG_FREED]) LOG (llevError | logBacktrace, "BUG: tried to activate freed object %s\n", debug_desc ());//D |
|
|
836 | if (has_active_speed () && flag [FLAG_DEBUG]) LOG (llevError | logBacktrace, "BUG: tried to activate DEBUG object %s\n", debug_desc ());//D temp |
|
|
837 | |
|
|
838 | if (has_active_speed ()) |
822 | if (has_active_speed ()) |
|
|
823 | { |
|
|
824 | if (flag [FLAG_FREED]) |
|
|
825 | LOG (llevError | logBacktrace, "BUG: tried to activate freed object %s\n", debug_desc ());//D |
|
|
826 | |
839 | actives.insert (this); |
827 | actives.insert (this); |
|
|
828 | } |
840 | } |
829 | } |
841 | |
830 | |
842 | void |
831 | void |
843 | object::activate_recursive () |
832 | object::activate_recursive () |
844 | { |
833 | { |
… | |
… | |
962 | |
951 | |
963 | void |
952 | void |
964 | object::do_destroy () |
953 | object::do_destroy () |
965 | { |
954 | { |
966 | if (flag [FLAG_IS_LINKED]) |
955 | if (flag [FLAG_IS_LINKED]) |
967 | remove_button_link (this); |
956 | remove_link (); |
968 | |
957 | |
969 | if (flag [FLAG_FRIENDLY]) |
958 | if (flag [FLAG_FRIENDLY]) |
970 | remove_friendly_object (this); |
959 | remove_friendly_object (this); |
971 | |
960 | |
972 | remove (); |
961 | remove (); |
… | |
… | |
1030 | * the previous environment. |
1019 | * the previous environment. |
1031 | */ |
1020 | */ |
1032 | void |
1021 | void |
1033 | object::do_remove () |
1022 | object::do_remove () |
1034 | { |
1023 | { |
1035 | object *tmp, *last = 0; |
|
|
1036 | object *otmp; |
|
|
1037 | |
|
|
1038 | if (flag [FLAG_REMOVED]) |
1024 | if (flag [FLAG_REMOVED]) |
1039 | return; |
1025 | return; |
1040 | |
1026 | |
1041 | INVOKE_OBJECT (REMOVE, this); |
1027 | INVOKE_OBJECT (REMOVE, this); |
1042 | |
1028 | |
… | |
… | |
1079 | /* NO_FIX_PLAYER is set when a great many changes are being |
1065 | /* NO_FIX_PLAYER is set when a great many changes are being |
1080 | * made to players inventory. If set, avoiding the call |
1066 | * made to players inventory. If set, avoiding the call |
1081 | * to save cpu time. |
1067 | * to save cpu time. |
1082 | */ |
1068 | */ |
1083 | if (pl) |
1069 | if (pl) |
1084 | if (pl->contr && !QUERY_FLAG (pl, FLAG_NO_FIX_PLAYER)) |
1070 | if (pl->is_player () && (glow_radius || !QUERY_FLAG (pl, FLAG_NO_FIX_PLAYER))) |
1085 | { |
1071 | { |
1086 | pl->update_stats (); |
1072 | pl->update_stats (); |
1087 | |
1073 | |
1088 | if (affects_los () && pl->is_on_map () && pl->map->darkness) |
1074 | if (glow_radius && pl->is_on_map ()) |
1089 | update_all_los (pl->map, pl->x, pl->y); |
1075 | update_all_los (pl->map, pl->x, pl->y); |
1090 | } |
1076 | } |
1091 | } |
1077 | } |
1092 | else if (map) |
1078 | else if (map) |
1093 | { |
1079 | { |
1094 | map->dirty = true; |
1080 | map->dirty = true; |
1095 | mapspace &ms = this->ms (); |
1081 | mapspace &ms = this->ms (); |
1096 | |
1082 | |
1097 | if (object *pl = ms.player ()) |
1083 | if (object *pl = ms.player ()) |
1098 | { |
1084 | { |
1099 | if (type == PLAYER) // this == pl(!) |
1085 | if (is_player ()) |
1100 | { |
1086 | { |
|
|
1087 | if (!flag [FLAG_WIZPASS]) |
|
|
1088 | ms.smell = ++mapspace::smellcount; // remember the smell of the player |
|
|
1089 | |
1101 | // leaving a spot always closes any open container on the ground |
1090 | // leaving a spot always closes any open container on the ground |
1102 | if (container && !container->env) |
1091 | if (container && !container->env) |
1103 | // this causes spurious floorbox updates, but it ensures |
1092 | // this causes spurious floorbox updates, but it ensures |
1104 | // that the CLOSE event is being sent. |
1093 | // that the CLOSE event is being sent. |
1105 | close_container (); |
1094 | close_container (); |
1106 | |
1095 | |
1107 | --map->players; |
1096 | --map->players; |
1108 | map->touch (); |
1097 | map->touch (); |
1109 | } |
1098 | } |
1110 | else if (pl->container == this) |
1099 | else if (pl->container_ () == this) |
1111 | { |
1100 | { |
1112 | // removing a container should close it |
1101 | // removing a container should close it |
1113 | close_container (); |
1102 | close_container (); |
1114 | } |
1103 | } |
1115 | |
1104 | |
… | |
… | |
1131 | |
1120 | |
1132 | int check_walk_off = !flag [FLAG_NO_APPLY]; |
1121 | int check_walk_off = !flag [FLAG_NO_APPLY]; |
1133 | |
1122 | |
1134 | if (object *pl = ms.player ()) |
1123 | if (object *pl = ms.player ()) |
1135 | { |
1124 | { |
1136 | if (pl->container == this) |
1125 | if (pl->container_ () == this) |
1137 | /* If a container that the player is currently using somehow gets |
1126 | /* If a container that the player is currently using somehow gets |
1138 | * removed (most likely destroyed), update the player view |
1127 | * removed (most likely destroyed), update the player view |
1139 | * appropriately. |
1128 | * appropriately. |
1140 | */ |
1129 | */ |
1141 | pl->close_container (); |
1130 | pl->close_container (); |
… | |
… | |
1145 | //TODO: update floorbox to preserve ordering |
1134 | //TODO: update floorbox to preserve ordering |
1146 | if (pl->contr->ns) |
1135 | if (pl->contr->ns) |
1147 | pl->contr->ns->floorbox_update (); |
1136 | pl->contr->ns->floorbox_update (); |
1148 | } |
1137 | } |
1149 | |
1138 | |
|
|
1139 | if (check_walk_off) |
1150 | for (tmp = ms.bot; tmp; tmp = tmp->above) |
1140 | for (object *above, *tmp = ms.bot; tmp; tmp = above) |
1151 | { |
1141 | { |
|
|
1142 | above = tmp->above; |
|
|
1143 | |
1152 | /* No point updating the players look faces if he is the object |
1144 | /* No point updating the players look faces if he is the object |
1153 | * being removed. |
1145 | * being removed. |
1154 | */ |
1146 | */ |
1155 | |
1147 | |
1156 | /* See if object moving off should effect something */ |
1148 | /* See if object moving off should effect something */ |
1157 | if (check_walk_off |
|
|
1158 | && ((move_type & tmp->move_off) |
1149 | if ((move_type & tmp->move_off) |
1159 | && (move_type & ~tmp->move_off & ~tmp->move_block) == 0)) |
1150 | && (move_type & ~tmp->move_off & ~tmp->move_block) == 0) |
1160 | { |
|
|
1161 | move_apply (tmp, this, 0); |
1151 | move_apply (tmp, this, 0); |
1162 | |
|
|
1163 | if (destroyed ()) |
|
|
1164 | LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ()); |
|
|
1165 | } |
1152 | } |
1166 | |
1153 | |
1167 | last = tmp; |
1154 | if (affects_los ()) |
1168 | } |
|
|
1169 | |
|
|
1170 | if (map->darkness && affects_los ()) |
|
|
1171 | update_all_los (map, x, y); |
1155 | update_all_los (map, x, y); |
1172 | } |
1156 | } |
1173 | } |
1157 | } |
1174 | |
1158 | |
1175 | /* |
1159 | /* |
… | |
… | |
1282 | |
1266 | |
1283 | /* Ideally, the caller figures this out. However, it complicates a lot |
1267 | /* 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 |
1268 | * of areas of callers (eg, anything that uses find_free_spot would now |
1285 | * need extra work |
1269 | * need extra work |
1286 | */ |
1270 | */ |
|
|
1271 | maptile *newmap = m; |
1287 | if (!xy_normalise (m, op->x, op->y)) |
1272 | if (!xy_normalise (newmap, op->x, op->y)) |
1288 | { |
1273 | { |
1289 | op->head_ ()->destroy ();// remove head_ once all tail object destroyers found |
1274 | op->head_ ()->destroy ();// remove head_ once all tail object destroyers found |
1290 | return 0; |
1275 | return 0; |
1291 | } |
1276 | } |
1292 | |
1277 | |
1293 | if (object *more = op->more) |
1278 | if (object *more = op->more) |
1294 | if (!insert_ob_in_map (more, m, originator, flag)) |
1279 | if (!insert_ob_in_map (more, m, originator, flag)) |
1295 | return 0; |
1280 | return 0; |
1296 | |
1281 | |
1297 | CLEAR_FLAG (op, FLAG_REMOVED); |
1282 | op->flag [FLAG_REMOVED] = false; |
1298 | |
1283 | op->env = 0; |
1299 | op->map = m; |
1284 | op->map = newmap; |
|
|
1285 | |
1300 | mapspace &ms = op->ms (); |
1286 | mapspace &ms = op->ms (); |
1301 | |
1287 | |
1302 | /* this has to be done after we translate the coordinates. |
1288 | /* this has to be done after we translate the coordinates. |
1303 | */ |
1289 | */ |
1304 | if (op->nrof && !(flag & INS_NO_MERGE)) |
1290 | if (op->nrof && !(flag & INS_NO_MERGE)) |
… | |
… | |
1325 | LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n"); |
1311 | LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n"); |
1326 | abort (); |
1312 | abort (); |
1327 | } |
1313 | } |
1328 | |
1314 | |
1329 | if (!originator->is_on_map ()) |
1315 | if (!originator->is_on_map ()) |
|
|
1316 | { |
1330 | LOG (llevDebug | logBacktrace, "insert_ob_in_map(%s) called with INS_BELOW_ORIGINATOR when originator '%s' not on map", |
1317 | LOG (llevError, "insert_ob_in_map(%s) called with INS_BELOW_ORIGINATOR when originator '%s' not on map", |
1331 | op->debug_desc (), originator->debug_desc ()); |
1318 | op->debug_desc (), originator->debug_desc ()); |
|
|
1319 | abort (); |
|
|
1320 | } |
1332 | |
1321 | |
1333 | op->above = originator; |
1322 | op->above = originator; |
1334 | op->below = originator->below; |
1323 | op->below = originator->below; |
1335 | originator->below = op; |
1324 | originator->below = op; |
1336 | |
1325 | |
… | |
… | |
1422 | op->below = top; |
1411 | op->below = top; |
1423 | *(op->above ? &op->above->below : &ms.top) = op; |
1412 | *(op->above ? &op->above->below : &ms.top) = op; |
1424 | } |
1413 | } |
1425 | } |
1414 | } |
1426 | |
1415 | |
1427 | if (op->type == PLAYER) |
1416 | if (op->is_player ()) |
1428 | { |
1417 | { |
1429 | op->contr->do_los = 1; |
1418 | op->contr->do_los = 1; |
1430 | ++op->map->players; |
1419 | ++op->map->players; |
1431 | op->map->touch (); |
1420 | op->map->touch (); |
1432 | } |
1421 | } |
… | |
… | |
1447 | * be far away from this change and not affected in any way - |
1436 | * be far away from this change and not affected in any way - |
1448 | * this should get redone to only look for players within range, |
1437 | * this should get redone to only look for players within range, |
1449 | * or just updating the P_UPTODATE for spaces within this area |
1438 | * or just updating the P_UPTODATE for spaces within this area |
1450 | * of effect may be sufficient. |
1439 | * of effect may be sufficient. |
1451 | */ |
1440 | */ |
1452 | if (op->affects_los () && op->map->darkness) |
1441 | if (op->affects_los ()) |
1453 | { |
1442 | { |
1454 | op->ms ().invalidate (); |
1443 | op->ms ().invalidate (); |
1455 | update_all_los (op->map, op->x, op->y); |
1444 | update_all_los (op->map, op->x, op->y); |
1456 | } |
1445 | } |
1457 | |
1446 | |
… | |
… | |
1468 | * blocked() and wall() work properly), and these flags are updated by |
1457 | * blocked() and wall() work properly), and these flags are updated by |
1469 | * update_object(). |
1458 | * update_object(). |
1470 | */ |
1459 | */ |
1471 | |
1460 | |
1472 | /* if this is not the head or flag has been passed, don't check walk on status */ |
1461 | /* if this is not the head or flag has been passed, don't check walk on status */ |
1473 | if (!(flag & INS_NO_WALK_ON) && op->head_ () == op) |
1462 | if (!(flag & INS_NO_WALK_ON) && op->is_head ()) |
1474 | { |
1463 | { |
1475 | if (check_move_on (op, originator)) |
1464 | if (check_move_on (op, originator)) |
1476 | return 0; |
1465 | return 0; |
1477 | |
1466 | |
1478 | /* If we are a multi part object, lets work our way through the check |
1467 | /* If we are a multi part object, lets work our way through the check |
… | |
… | |
1489 | /* this function inserts an object in the map, but if it |
1478 | /* this function inserts an object in the map, but if it |
1490 | * finds an object of its own type, it'll remove that one first. |
1479 | * finds an object of its own type, it'll remove that one first. |
1491 | * op is the object to insert it under: supplies x and the map. |
1480 | * op is the object to insert it under: supplies x and the map. |
1492 | */ |
1481 | */ |
1493 | void |
1482 | void |
1494 | replace_insert_ob_in_map (const char *arch_string, object *op) |
1483 | replace_insert_ob_in_map (shstr_tmp archname, object *op) |
1495 | { |
1484 | { |
1496 | /* first search for itself and remove any old instances */ |
1485 | /* first search for itself and remove any old instances */ |
1497 | |
1486 | |
1498 | for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above) |
1487 | for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above) |
1499 | if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */ |
1488 | if (tmp->arch->archname == archname) /* same archetype */ |
1500 | tmp->destroy (); |
1489 | tmp->destroy (); |
1501 | |
1490 | |
1502 | object *tmp = arch_to_object (archetype::find (arch_string)); |
1491 | object *tmp = arch_to_object (archetype::find (archname)); |
1503 | |
1492 | |
1504 | tmp->x = op->x; |
1493 | tmp->x = op->x; |
1505 | tmp->y = op->y; |
1494 | tmp->y = op->y; |
1506 | |
1495 | |
1507 | insert_ob_in_map (tmp, op->map, op, 0); |
1496 | insert_ob_in_map (tmp, op->map, op, 0); |
… | |
… | |
1656 | |
1645 | |
1657 | adjust_weight (this, op->total_weight ()); |
1646 | adjust_weight (this, op->total_weight ()); |
1658 | |
1647 | |
1659 | inserted: |
1648 | inserted: |
1660 | /* reset the light list and los of the players on the map */ |
1649 | /* reset the light list and los of the players on the map */ |
1661 | if (op->glow_radius && is_on_map () && map->darkness) |
1650 | if (op->glow_radius && is_on_map ()) |
1662 | { |
1651 | { |
1663 | update_stats (); |
1652 | update_stats (); |
1664 | update_all_los (map, x, y); |
1653 | update_all_los (map, x, y); |
1665 | } |
1654 | } |
1666 | else if (type == PLAYER && !flag [FLAG_NO_FIX_PLAYER]) |
1655 | else if (is_player () && !flag [FLAG_NO_FIX_PLAYER]) |
1667 | // if this is a player's inventory, update stats |
1656 | // if this is a player's inventory, update stats |
1668 | update_stats (); |
1657 | update_stats (); |
1669 | |
1658 | |
1670 | INVOKE_OBJECT (INSERT, this); |
1659 | INVOKE_OBJECT (INSERT, this); |
1671 | |
1660 | |
… | |
… | |
1693 | * on top. |
1682 | * on top. |
1694 | */ |
1683 | */ |
1695 | int |
1684 | int |
1696 | check_move_on (object *op, object *originator) |
1685 | check_move_on (object *op, object *originator) |
1697 | { |
1686 | { |
|
|
1687 | if (QUERY_FLAG (op, FLAG_NO_APPLY)) |
|
|
1688 | return 0; |
|
|
1689 | |
1698 | object *tmp; |
1690 | object *tmp; |
1699 | maptile *m = op->map; |
1691 | maptile *m = op->map; |
1700 | int x = op->x, y = op->y; |
1692 | int x = op->x, y = op->y; |
1701 | |
1693 | |
1702 | MoveType move_on, move_slow, move_block; |
1694 | mapspace &ms = m->at (x, y); |
1703 | |
1695 | |
1704 | if (QUERY_FLAG (op, FLAG_NO_APPLY)) |
1696 | ms.update (); |
1705 | return 0; |
|
|
1706 | |
1697 | |
1707 | move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y); |
1698 | MoveType move_on = ms.move_on; |
1708 | move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y); |
1699 | MoveType move_slow = ms.move_slow; |
1709 | move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y); |
1700 | MoveType move_block = ms.move_block; |
1710 | |
1701 | |
1711 | /* if nothing on this space will slow op down or be applied, |
1702 | /* if nothing on this space will slow op down or be applied, |
1712 | * no need to do checking below. have to make sure move_type |
1703 | * no need to do checking below. have to make sure move_type |
1713 | * is set, as lots of objects don't have it set - we treat that |
1704 | * is set, as lots of objects don't have it set - we treat that |
1714 | * as walking. |
1705 | * as walking. |
… | |
… | |
1725 | return 0; |
1716 | return 0; |
1726 | |
1717 | |
1727 | /* The objects have to be checked from top to bottom. |
1718 | /* The objects have to be checked from top to bottom. |
1728 | * Hence, we first go to the top: |
1719 | * Hence, we first go to the top: |
1729 | */ |
1720 | */ |
1730 | |
1721 | for (object *next, *tmp = ms.top; tmp; tmp = next) |
1731 | for (tmp = op->ms ().bot; tmp && tmp->above; tmp = tmp->above) |
|
|
1732 | { |
|
|
1733 | /* Trim the search when we find the first other spell effect |
|
|
1734 | * this helps performance so that if a space has 50 spell objects, |
|
|
1735 | * we don't need to check all of them. |
|
|
1736 | */ |
|
|
1737 | if ((tmp->move_type & MOVE_FLY_LOW) && QUERY_FLAG (tmp, FLAG_NO_PICK)) |
|
|
1738 | break; |
|
|
1739 | } |
1722 | { |
|
|
1723 | next = tmp->below; |
1740 | |
1724 | |
1741 | for (; tmp; tmp = tmp->below) |
|
|
1742 | { |
|
|
1743 | if (tmp == op) |
1725 | if (tmp == op) |
1744 | continue; /* Can't apply yourself */ |
1726 | continue; /* Can't apply yourself */ |
1745 | |
1727 | |
1746 | /* Check to see if one of the movement types should be slowed down. |
1728 | /* Check to see if one of the movement types should be slowed down. |
1747 | * Second check makes sure that the movement types not being slowed |
1729 | * Second check makes sure that the movement types not being slowed |
… | |
… | |
1752 | if (!QUERY_FLAG (op, FLAG_WIZPASS)) |
1734 | if (!QUERY_FLAG (op, FLAG_WIZPASS)) |
1753 | { |
1735 | { |
1754 | if ((!op->move_type && tmp->move_slow & MOVE_WALK) || |
1736 | if ((!op->move_type && tmp->move_slow & MOVE_WALK) || |
1755 | ((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0)) |
1737 | ((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0)) |
1756 | { |
1738 | { |
1757 | |
|
|
1758 | float |
|
|
1759 | diff = tmp->move_slow_penalty * fabs (op->speed); |
1739 | float diff = tmp->move_slow_penalty * fabs (op->speed); |
1760 | |
1740 | |
1761 | if (op->type == PLAYER) |
1741 | if (op->is_player ()) |
1762 | if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) || |
1742 | if ((tmp->flag [FLAG_IS_HILLY ] && find_skill_by_number (op, SK_CLIMBING)) || |
1763 | (QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN))) |
1743 | (tmp->flag [FLAG_IS_WOODED] && find_skill_by_number (op, SK_WOODSMAN))) |
1764 | diff /= 4.0; |
1744 | diff /= 4.0; |
1765 | |
1745 | |
1766 | op->speed_left -= diff; |
1746 | op->speed_left -= diff; |
1767 | } |
1747 | } |
1768 | } |
1748 | } |
… | |
… | |
2052 | * there is capable of. |
2032 | * there is capable of. |
2053 | */ |
2033 | */ |
2054 | int |
2034 | int |
2055 | find_dir (maptile *m, int x, int y, object *exclude) |
2035 | find_dir (maptile *m, int x, int y, object *exclude) |
2056 | { |
2036 | { |
2057 | int i, max = SIZEOFFREE, mflags; |
2037 | int max = SIZEOFFREE, mflags; |
2058 | |
|
|
2059 | sint16 nx, ny; |
|
|
2060 | object *tmp; |
|
|
2061 | maptile *mp; |
|
|
2062 | |
|
|
2063 | MoveType blocked, move_type; |
2038 | MoveType move_type; |
2064 | |
2039 | |
2065 | if (exclude && exclude->head_ () != exclude) |
2040 | if (exclude && exclude->head_ () != exclude) |
2066 | { |
2041 | { |
2067 | exclude = exclude->head; |
2042 | exclude = exclude->head; |
2068 | move_type = exclude->move_type; |
2043 | move_type = exclude->move_type; |
… | |
… | |
2071 | { |
2046 | { |
2072 | /* If we don't have anything, presume it can use all movement types. */ |
2047 | /* If we don't have anything, presume it can use all movement types. */ |
2073 | move_type = MOVE_ALL; |
2048 | move_type = MOVE_ALL; |
2074 | } |
2049 | } |
2075 | |
2050 | |
2076 | for (i = 1; i < max; i++) |
2051 | for (int i = 1; i < max; i++) |
2077 | { |
2052 | { |
2078 | mp = m; |
2053 | mapxy pos (m, x, y); |
2079 | nx = x + freearr_x[i]; |
2054 | pos.move (i); |
2080 | ny = y + freearr_y[i]; |
|
|
2081 | |
2055 | |
2082 | mflags = get_map_flags (m, &mp, nx, ny, &nx, &ny); |
2056 | if (!pos.normalise ()) |
2083 | |
|
|
2084 | if (mflags & P_OUT_OF_MAP) |
|
|
2085 | max = maxfree[i]; |
2057 | max = maxfree[i]; |
2086 | else |
2058 | else |
2087 | { |
2059 | { |
2088 | mapspace &ms = mp->at (nx, ny); |
2060 | mapspace &ms = *pos; |
2089 | |
2061 | |
2090 | blocked = ms.move_block; |
|
|
2091 | |
|
|
2092 | if ((move_type & blocked) == move_type) |
2062 | if ((move_type & ms.move_block) == move_type) |
2093 | max = maxfree[i]; |
2063 | max = maxfree [i]; |
2094 | else if (mflags & P_IS_ALIVE) |
2064 | else if (ms.flags () & P_IS_ALIVE) |
2095 | { |
2065 | { |
2096 | for (tmp = ms.bot; tmp; tmp = tmp->above) |
2066 | for (object *tmp = ms.bot; tmp; tmp = tmp->above) |
2097 | if ((tmp->flag [FLAG_MONSTER] || tmp->type == PLAYER) |
2067 | if ((tmp->flag [FLAG_MONSTER] || tmp->is_player ()) |
2098 | && (tmp != exclude || (tmp->head_ () != tmp && tmp->head_ () != exclude))) |
2068 | && (tmp != exclude || (tmp->head_ () != tmp && tmp->head_ () != exclude))) |
2099 | break; |
|
|
2100 | |
|
|
2101 | if (tmp) |
|
|
2102 | return freedir[i]; |
2069 | return freedir [i]; |
2103 | } |
2070 | } |
2104 | } |
2071 | } |
2105 | } |
2072 | } |
2106 | |
2073 | |
2107 | return 0; |
2074 | return 0; |
… | |
… | |
2182 | * This basically means that if direction is 15, then it could either go |
2149 | * This basically means that if direction is 15, then it could either go |
2183 | * direction 4, 14, or 16 to get back to where we are. |
2150 | * direction 4, 14, or 16 to get back to where we are. |
2184 | * Moved from spell_util.c to object.c with the other related direction |
2151 | * Moved from spell_util.c to object.c with the other related direction |
2185 | * functions. |
2152 | * functions. |
2186 | */ |
2153 | */ |
2187 | int reduction_dir[SIZEOFFREE][3] = { |
2154 | static const int reduction_dir[SIZEOFFREE][3] = { |
2188 | {0, 0, 0}, /* 0 */ |
2155 | {0, 0, 0}, /* 0 */ |
2189 | {0, 0, 0}, /* 1 */ |
2156 | {0, 0, 0}, /* 1 */ |
2190 | {0, 0, 0}, /* 2 */ |
2157 | {0, 0, 0}, /* 2 */ |
2191 | {0, 0, 0}, /* 3 */ |
2158 | {0, 0, 0}, /* 3 */ |
2192 | {0, 0, 0}, /* 4 */ |
2159 | {0, 0, 0}, /* 4 */ |
… | |
… | |
2288 | int |
2255 | int |
2289 | can_pick (const object *who, const object *item) |
2256 | can_pick (const object *who, const object *item) |
2290 | { |
2257 | { |
2291 | return /*QUERY_FLAG(who,FLAG_WIZ)|| */ |
2258 | return /*QUERY_FLAG(who,FLAG_WIZ)|| */ |
2292 | (item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) && |
2259 | (item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) && |
2293 | !QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->type == PLAYER || item->weight < who->weight / 3)); |
2260 | !QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->is_player () || item->weight < who->weight / 3)); |
2294 | } |
2261 | } |
2295 | |
2262 | |
2296 | /* |
2263 | /* |
2297 | * create clone from object to another |
2264 | * create clone from object to another |
2298 | */ |
2265 | */ |
… | |
… | |
2330 | return tmp; |
2297 | return tmp; |
2331 | |
2298 | |
2332 | return 0; |
2299 | return 0; |
2333 | } |
2300 | } |
2334 | |
2301 | |
2335 | const shstr & |
2302 | shstr_tmp |
2336 | object::kv_get (const shstr &key) const |
2303 | object::kv_get (shstr_tmp key) const |
2337 | { |
2304 | { |
2338 | for (key_value *kv = key_values; kv; kv = kv->next) |
2305 | for (key_value *kv = key_values; kv; kv = kv->next) |
2339 | if (kv->key == key) |
2306 | if (kv->key == key) |
2340 | return kv->value; |
2307 | return kv->value; |
2341 | |
2308 | |
2342 | return shstr_null; |
2309 | return shstr (); |
2343 | } |
2310 | } |
2344 | |
2311 | |
2345 | void |
2312 | void |
2346 | object::kv_set (const shstr &key, const shstr &value) |
2313 | object::kv_set (shstr_tmp key, shstr_tmp value) |
2347 | { |
2314 | { |
2348 | for (key_value *kv = key_values; kv; kv = kv->next) |
2315 | for (key_value *kv = key_values; kv; kv = kv->next) |
2349 | if (kv->key == key) |
2316 | if (kv->key == key) |
2350 | { |
2317 | { |
2351 | kv->value = value; |
2318 | kv->value = value; |
… | |
… | |
2360 | |
2327 | |
2361 | key_values = kv; |
2328 | key_values = kv; |
2362 | } |
2329 | } |
2363 | |
2330 | |
2364 | void |
2331 | void |
2365 | object::kv_del (const shstr &key) |
2332 | object::kv_del (shstr_tmp key) |
2366 | { |
2333 | { |
2367 | for (key_value **kvp = &key_values; *kvp; kvp = &(*kvp)->next) |
2334 | for (key_value **kvp = &key_values; *kvp; kvp = &(*kvp)->next) |
2368 | if ((*kvp)->key == key) |
2335 | if ((*kvp)->key == key) |
2369 | { |
2336 | { |
2370 | key_value *kv = *kvp; |
2337 | key_value *kv = *kvp; |
… | |
… | |
2501 | container = 0; |
2468 | container = 0; |
2502 | |
2469 | |
2503 | // client needs item update to make it work, client bug requires this to be separate |
2470 | // client needs item update to make it work, client bug requires this to be separate |
2504 | esrv_update_item (UPD_FLAGS, this, old_container); |
2471 | esrv_update_item (UPD_FLAGS, this, old_container); |
2505 | |
2472 | |
2506 | new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container)); |
2473 | new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", old_container->query_name ()); |
2507 | play_sound (sound_find ("chest_close")); |
2474 | play_sound (sound_find ("chest_close")); |
2508 | } |
2475 | } |
2509 | |
2476 | |
2510 | if (new_container) |
2477 | if (new_container) |
2511 | { |
2478 | { |
… | |
… | |
2521 | closer->flag [FLAG_NO_MAP_SAVE] = 1; |
2488 | closer->flag [FLAG_NO_MAP_SAVE] = 1; |
2522 | new_container->insert (closer); |
2489 | new_container->insert (closer); |
2523 | } |
2490 | } |
2524 | #endif |
2491 | #endif |
2525 | |
2492 | |
2526 | new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container)); |
2493 | new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", new_container->query_name ()); |
2527 | |
2494 | |
2528 | // make sure the container is available, client bug requires this to be separate |
2495 | // make sure the container is available, client bug requires this to be separate |
2529 | esrv_send_item (this, new_container); |
2496 | esrv_send_item (this, new_container); |
2530 | |
2497 | |
2531 | new_container->flag [FLAG_APPLIED] = true; |
2498 | new_container->flag [FLAG_APPLIED] = true; |
… | |
… | |
2539 | // else if (!old_container->env && contr && contr->ns) |
2506 | // else if (!old_container->env && contr && contr->ns) |
2540 | // contr->ns->floorbox_reset (); |
2507 | // contr->ns->floorbox_reset (); |
2541 | } |
2508 | } |
2542 | |
2509 | |
2543 | object * |
2510 | object * |
2544 | object::force_find (const shstr name) |
2511 | object::force_find (shstr_tmp name) |
2545 | { |
2512 | { |
2546 | /* cycle through his inventory to look for the MARK we want to |
2513 | /* cycle through his inventory to look for the MARK we want to |
2547 | * place |
2514 | * place |
2548 | */ |
2515 | */ |
2549 | for (object *tmp = inv; tmp; tmp = tmp->below) |
2516 | for (object *tmp = inv; tmp; tmp = tmp->below) |
… | |
… | |
2551 | return splay (tmp); |
2518 | return splay (tmp); |
2552 | |
2519 | |
2553 | return 0; |
2520 | return 0; |
2554 | } |
2521 | } |
2555 | |
2522 | |
|
|
2523 | //-GPL |
|
|
2524 | |
|
|
2525 | void |
|
|
2526 | object::force_set_timer (int duration) |
|
|
2527 | { |
|
|
2528 | this->duration = 1; |
|
|
2529 | this->speed_left = -1.f; |
|
|
2530 | |
|
|
2531 | this->set_speed (duration ? 1.f / duration : 0.f); |
|
|
2532 | } |
|
|
2533 | |
2556 | object * |
2534 | object * |
2557 | object::force_add (const shstr name, int duration) |
2535 | object::force_add (shstr_tmp name, int duration) |
2558 | { |
2536 | { |
2559 | if (object *force = force_find (name)) |
2537 | if (object *force = force_find (name)) |
2560 | force->destroy (); |
2538 | force->destroy (); |
2561 | |
2539 | |
2562 | object *force = get_archetype (FORCE_NAME); |
2540 | object *force = get_archetype (FORCE_NAME); |
2563 | |
2541 | |
2564 | force->slaying = name; |
2542 | force->slaying = name; |
2565 | force->stats.food = 1; |
2543 | force->force_set_timer (duration); |
2566 | force->speed_left = -1.f; |
|
|
2567 | |
|
|
2568 | force->set_speed (duration ? 1.f / duration : 0.f); |
|
|
2569 | force->flag [FLAG_IS_USED_UP] = true; |
|
|
2570 | force->flag [FLAG_APPLIED] = true; |
2544 | force->flag [FLAG_APPLIED] = true; |
2571 | |
2545 | |
2572 | return insert (force); |
2546 | return insert (force); |
2573 | } |
2547 | } |
2574 | |
2548 | |
2575 | void |
2549 | void |
2576 | object::play_sound (faceidx sound) |
2550 | object::play_sound (faceidx sound) const |
2577 | { |
2551 | { |
2578 | if (!sound) |
2552 | if (!sound) |
2579 | return; |
2553 | return; |
2580 | |
2554 | |
2581 | if (flag [FLAG_REMOVED]) |
2555 | if (is_on_map ()) |
2582 | return; |
|
|
2583 | |
|
|
2584 | if (env) |
|
|
2585 | { |
|
|
2586 | if (object *pl = in_player ()) |
|
|
2587 | pl->contr->play_sound (sound); |
|
|
2588 | } |
|
|
2589 | else |
|
|
2590 | map->play_sound (sound, x, y); |
2556 | map->play_sound (sound, x, y); |
|
|
2557 | else if (object *pl = in_player ()) |
|
|
2558 | pl->contr->play_sound (sound); |
|
|
2559 | } |
|
|
2560 | |
|
|
2561 | void |
|
|
2562 | object::say_msg (const char *msg) const |
|
|
2563 | { |
|
|
2564 | if (is_on_map ()) |
|
|
2565 | map->say_msg (msg, x, y); |
|
|
2566 | else if (object *pl = in_player ()) |
|
|
2567 | pl->contr->play_sound (sound); |
2591 | } |
2568 | } |
2592 | |
2569 | |
2593 | void |
2570 | void |
2594 | object::make_noise () |
2571 | object::make_noise () |
2595 | { |
2572 | { |
2596 | // we do not model noise in the map, so instead put |
2573 | // we do not model noise in the map, so instead put |
2597 | // a temporary light into the noise source |
2574 | // a temporary light into the noise source |
2598 | // could use the map instead, but that's less reliable for our |
2575 | // could use the map instead, but that's less reliable for our |
2599 | // goal, which is to make invisibility a bit harder to exploit |
2576 | // goal, which is to make invisibility a bit harder to exploit |
2600 | |
2577 | |
|
|
2578 | // currently only works sensibly for players |
|
|
2579 | if (!is_player ()) |
|
|
2580 | return; |
|
|
2581 | |
2601 | // find old force, or create new one |
2582 | // find old force, or create new one |
2602 | object *force = force_find (shstr_noise_force); |
2583 | object *force = force_find (shstr_noise_force); |
2603 | |
2584 | |
2604 | if (force) |
2585 | if (force) |
2605 | force->speed = 1.f / 4; // patch old speed up |
2586 | force->speed_left = -1.f; // patch old speed up |
2606 | else |
2587 | else |
2607 | { |
2588 | { |
2608 | force = get_archetype (shstr_noise_force); |
2589 | force = archetype::get (shstr_noise_force); |
2609 | |
2590 | |
2610 | force->slaying = name; |
2591 | force->slaying = shstr_noise_force; |
2611 | force->stats.food = 1; |
2592 | force->stats.food = 1; |
2612 | force->speed_left = -1.f; |
2593 | force->speed_left = -1.f; |
2613 | |
2594 | |
2614 | force->set_speed (1.f / 4); |
2595 | force->set_speed (1.f / 4.f); |
2615 | force->flag [FLAG_IS_USED_UP] = true; |
2596 | force->flag [FLAG_IS_USED_UP] = true; |
2616 | force->flag [FLAG_APPLIED] = true; |
2597 | force->flag [FLAG_APPLIED] = true; |
2617 | |
2598 | |
2618 | insert (force); |
2599 | insert (force); |
2619 | } |
2600 | } |