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, |
… | |
… | |
186 | || ob1->speed != ob2->speed |
190 | || ob1->speed != ob2->speed |
187 | || ob1->value != ob2->value |
191 | || ob1->value != ob2->value |
188 | || ob1->name != ob2->name) |
192 | || ob1->name != ob2->name) |
189 | return 0; |
193 | return 0; |
190 | |
194 | |
191 | /* Do not merge objects if nrof would overflow. First part checks |
195 | /* Do not merge objects if nrof would overflow, assume nrof |
192 | * for unsigned overflow (2c), second part checks whether the result |
196 | * is always 0 .. 2**31-1 */ |
193 | * would fit into a 32 bit signed int, which is often used to hold |
197 | 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; |
198 | return 0; |
198 | |
199 | |
199 | /* If the objects have been identified, set the BEEN_APPLIED flag. |
200 | /* 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 |
201 | * 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 |
202 | * just can't ignore the been applied or identified flags, as they |
… | |
… | |
235 | || memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats))) |
236 | || memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats))) |
236 | return 0; |
237 | return 0; |
237 | |
238 | |
238 | if ((ob1->flag ^ ob2->flag) |
239 | if ((ob1->flag ^ ob2->flag) |
239 | .reset (FLAG_INV_LOCKED) |
240 | .reset (FLAG_INV_LOCKED) |
240 | .reset (FLAG_CLIENT_SENT) |
|
|
241 | .reset (FLAG_REMOVED) |
241 | .reset (FLAG_REMOVED) |
242 | .any ()) |
242 | .any ()) |
243 | return 0; |
243 | return 0; |
244 | |
244 | |
245 | /* This is really a spellbook check - we should in general |
245 | /* This is really a spellbook check - we should in general |
… | |
… | |
327 | { |
327 | { |
328 | // see if we are in a container of sorts |
328 | // see if we are in a container of sorts |
329 | if (env) |
329 | if (env) |
330 | { |
330 | { |
331 | // the player inventory itself is always visible |
331 | // the player inventory itself is always visible |
332 | if (env->type == PLAYER) |
332 | if (env->is_player ()) |
333 | return env; |
333 | return env; |
334 | |
334 | |
335 | // else a player could have our env open |
335 | // else a player could have our env open |
336 | object *envest = env->outer_env (); |
336 | object *envest = env->outer_env_or_self (); |
337 | |
337 | |
338 | // the player itself is always on a map, so we will find him here |
338 | // the player itself is always on a map, so we will find him here |
339 | // even if our inv is in a player. |
339 | // even if our inv is in a player. |
340 | if (envest->is_on_map ()) |
340 | if (envest->is_on_map ()) |
341 | if (object *pl = envest->ms ().player ()) |
341 | if (object *pl = envest->ms ().player ()) |
342 | if (pl->container == env) |
342 | if (pl->container_ () == env) |
343 | return pl; |
343 | return pl; |
344 | } |
344 | } |
345 | else |
345 | else |
346 | { |
346 | { |
347 | // maybe there is a player standing on the same mapspace |
347 | // maybe there is a player standing on the same mapspace |
348 | // this will catch the case where "this" is a player |
348 | // this will catch the case where "this" is a player |
349 | if (object *pl = ms ().player ()) |
349 | if (object *pl = ms ().player ()) |
350 | if (!pl->container || this == pl->container) |
350 | if ((pl->contr->ns && !pl->container_ () && !pl->contr->ns->update_look) |
|
|
351 | || pl->container_ () == this) |
351 | return pl; |
352 | return pl; |
352 | } |
353 | } |
353 | } |
354 | } |
354 | |
355 | |
355 | return 0; |
356 | return 0; |
… | |
… | |
431 | return strdup ("[NULLOBJ]"); |
432 | return strdup ("[NULLOBJ]"); |
432 | |
433 | |
433 | object_freezer freezer; |
434 | object_freezer freezer; |
434 | op->write (freezer); |
435 | op->write (freezer); |
435 | return freezer.as_string (); |
436 | return freezer.as_string (); |
|
|
437 | } |
|
|
438 | |
|
|
439 | char * |
|
|
440 | object::as_string () |
|
|
441 | { |
|
|
442 | return dump_object (this); |
436 | } |
443 | } |
437 | |
444 | |
438 | /* |
445 | /* |
439 | * get_nearest_part(multi-object, object 2) returns the part of the |
446 | * get_nearest_part(multi-object, object 2) returns the part of the |
440 | * multi-object 1 which is closest to the second object. |
447 | * multi-object 1 which is closest to the second object. |
… | |
… | |
557 | update_stats (); |
564 | update_stats (); |
558 | |
565 | |
559 | new_draw_info_format (NDI_UNIQUE, 0, this, |
566 | new_draw_info_format (NDI_UNIQUE, 0, this, |
560 | "You try to balance all your items at once, " |
567 | "You try to balance all your items at once, " |
561 | "but the %s is just too much for your body. " |
568 | "but the %s is just too much for your body. " |
562 | "[You need to unapply some items first.]", &ob->name); |
569 | "[You need to unapply some items first - use the 'body' command to see " |
|
|
570 | "how many items you cna wera on a specific body part.]", &ob->name); |
563 | return false; |
571 | return false; |
564 | } |
572 | } |
565 | |
573 | |
566 | //new_draw_info_format (NDI_UNIQUE, 0, this, "You switch to your %s.", &ob->name); |
574 | //new_draw_info_format (NDI_UNIQUE, 0, this, "You switch to your %s.", &ob->name); |
567 | } |
575 | } |
… | |
… | |
639 | } |
647 | } |
640 | |
648 | |
641 | if (speed < 0) |
649 | if (speed < 0) |
642 | dst->speed_left -= rndm (); |
650 | dst->speed_left -= rndm (); |
643 | |
651 | |
644 | dst->set_speed (dst->speed); |
652 | dst->activate (); |
645 | } |
653 | } |
646 | |
654 | |
647 | void |
655 | void |
648 | object::instantiate () |
656 | object::instantiate () |
649 | { |
657 | { |
… | |
… | |
761 | else if (action == UP_OBJ_INSERT) |
769 | else if (action == UP_OBJ_INSERT) |
762 | { |
770 | { |
763 | // this is likely overkill, TODO: revisit (schmorp) |
771 | // this is likely overkill, TODO: revisit (schmorp) |
764 | if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW)) |
772 | if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW)) |
765 | || (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC)) |
773 | || (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC)) |
766 | || (op->type == PLAYER && !(m.flags_ & P_PLAYER)) |
774 | || (op->is_player () && !(m.flags_ & P_PLAYER)) |
767 | || (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE)) |
775 | || (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE)) |
768 | || (QUERY_FLAG (op, FLAG_ALIVE) && !(m.flags_ & P_IS_ALIVE)) |
776 | || (QUERY_FLAG (op, FLAG_ALIVE) && !(m.flags_ & P_IS_ALIVE)) |
769 | || (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC)) |
777 | || (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC)) |
770 | || (m.move_on | op->move_on ) != m.move_on |
778 | || (m.move_on | op->move_on ) != m.move_on |
771 | || (m.move_off | op->move_off ) != m.move_off |
779 | || (m.move_off | op->move_off ) != m.move_off |
772 | || (m.move_slow | op->move_slow) != m.move_slow |
780 | || (m.move_slow | op->move_slow) != m.move_slow |
773 | /* This isn't perfect, but I don't expect a lot of objects to |
781 | /* This isn't perfect, but I don't expect a lot of objects to |
774 | * to have move_allow right now. |
782 | * have move_allow right now. |
775 | */ |
783 | */ |
776 | || ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block |
784 | || ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block |
777 | || 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp) |
785 | || 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp) |
778 | m.flags_ = 0; |
786 | m.invalidate (); |
779 | } |
787 | } |
780 | /* if the object is being removed, we can't make intelligent |
788 | /* if the object is being removed, we can't make intelligent |
781 | * decisions, because remove_ob can't really pass the object |
789 | * decisions, because remove_ob can't really pass the object |
782 | * that is being removed. |
790 | * that is being removed. |
783 | */ |
791 | */ |
784 | else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE) |
792 | else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE) |
785 | m.flags_ = 0; |
793 | m.invalidate (); |
786 | else if (action == UP_OBJ_FACE) |
794 | else if (action == UP_OBJ_FACE) |
787 | /* Nothing to do for that case */ ; |
795 | /* Nothing to do for that case */ ; |
788 | else |
796 | else |
789 | LOG (llevError, "update_object called with invalid action: %d\n", action); |
797 | LOG (llevError, "update_object called with invalid action: %d\n", action); |
790 | |
798 | |
… | |
… | |
794 | |
802 | |
795 | object::object () |
803 | object::object () |
796 | { |
804 | { |
797 | SET_FLAG (this, FLAG_REMOVED); |
805 | SET_FLAG (this, FLAG_REMOVED); |
798 | |
806 | |
799 | expmul = 1.0; |
807 | //expmul = 1.0; declared const for the time being |
800 | face = blank_face; |
808 | face = blank_face; |
801 | } |
809 | } |
802 | |
810 | |
803 | object::~object () |
811 | object::~object () |
804 | { |
812 | { |
… | |
… | |
834 | /* If already on active list, don't do anything */ |
842 | /* If already on active list, don't do anything */ |
835 | if (active) |
843 | if (active) |
836 | return; |
844 | return; |
837 | |
845 | |
838 | if (has_active_speed ()) |
846 | if (has_active_speed ()) |
|
|
847 | { |
|
|
848 | if (flag [FLAG_FREED]) |
|
|
849 | LOG (llevError | logBacktrace, "BUG: tried to activate freed object %s\n", debug_desc ());//D |
|
|
850 | |
839 | actives.insert (this); |
851 | actives.insert (this); |
|
|
852 | } |
840 | } |
853 | } |
841 | |
854 | |
842 | void |
855 | void |
843 | object::activate_recursive () |
856 | object::activate_recursive () |
844 | { |
857 | { |
… | |
… | |
909 | || map->in_memory != MAP_ACTIVE |
922 | || map->in_memory != MAP_ACTIVE |
910 | || map->no_drop |
923 | || map->no_drop |
911 | || ms ().move_block == MOVE_ALL) |
924 | || ms ().move_block == MOVE_ALL) |
912 | { |
925 | { |
913 | while (inv) |
926 | while (inv) |
914 | { |
|
|
915 | inv->destroy_inv (false); |
|
|
916 | inv->destroy (); |
927 | inv->destroy (); |
917 | } |
|
|
918 | } |
928 | } |
919 | else |
929 | else |
920 | { /* Put objects in inventory onto this space */ |
930 | { /* Put objects in inventory onto this space */ |
921 | while (inv) |
931 | while (inv) |
922 | { |
932 | { |
… | |
… | |
926 | || op->flag [FLAG_NO_DROP] |
936 | || op->flag [FLAG_NO_DROP] |
927 | || op->type == RUNE |
937 | || op->type == RUNE |
928 | || op->type == TRAP |
938 | || op->type == TRAP |
929 | || op->flag [FLAG_IS_A_TEMPLATE] |
939 | || op->flag [FLAG_IS_A_TEMPLATE] |
930 | || op->flag [FLAG_DESTROY_ON_DEATH]) |
940 | || op->flag [FLAG_DESTROY_ON_DEATH]) |
931 | op->destroy (true); |
941 | op->destroy (); |
932 | else |
942 | else |
933 | map->insert (op, x, y); |
943 | map->insert (op, x, y); |
934 | } |
944 | } |
935 | } |
945 | } |
936 | } |
946 | } |
… | |
… | |
965 | |
975 | |
966 | void |
976 | void |
967 | object::do_destroy () |
977 | object::do_destroy () |
968 | { |
978 | { |
969 | if (flag [FLAG_IS_LINKED]) |
979 | if (flag [FLAG_IS_LINKED]) |
970 | remove_button_link (this); |
980 | remove_link (); |
971 | |
981 | |
972 | if (flag [FLAG_FRIENDLY]) |
982 | if (flag [FLAG_FRIENDLY]) |
973 | remove_friendly_object (this); |
983 | remove_friendly_object (this); |
974 | |
984 | |
975 | remove (); |
985 | remove (); |
… | |
… | |
1000 | attacked_by = 0; |
1010 | attacked_by = 0; |
1001 | current_weapon = 0; |
1011 | current_weapon = 0; |
1002 | } |
1012 | } |
1003 | |
1013 | |
1004 | void |
1014 | void |
1005 | object::destroy (bool destroy_inventory) |
1015 | object::destroy () |
1006 | { |
1016 | { |
1007 | if (destroyed ()) |
1017 | if (destroyed ()) |
1008 | return; |
1018 | return; |
1009 | |
1019 | |
1010 | if (!is_head () && !head->destroyed ()) |
1020 | if (!is_head () && !head->destroyed ()) |
1011 | { |
1021 | { |
1012 | LOG (llevError | logBacktrace, "tried to destroy the tail of an object"); |
1022 | LOG (llevError | logBacktrace, "tried to destroy the tail of an object"); |
1013 | head->destroy (destroy_inventory); |
1023 | head->destroy (); |
1014 | return; |
1024 | return; |
1015 | } |
1025 | } |
1016 | |
1026 | |
1017 | destroy_inv (!destroy_inventory); |
1027 | destroy_inv (false); |
1018 | |
1028 | |
1019 | if (is_head ()) |
1029 | if (is_head ()) |
1020 | if (sound_destroy) |
1030 | if (sound_destroy) |
1021 | play_sound (sound_destroy); |
1031 | play_sound (sound_destroy); |
1022 | else if (flag [FLAG_MONSTER]) |
1032 | else if (flag [FLAG_MONSTER]) |
… | |
… | |
1033 | * the previous environment. |
1043 | * the previous environment. |
1034 | */ |
1044 | */ |
1035 | void |
1045 | void |
1036 | object::do_remove () |
1046 | object::do_remove () |
1037 | { |
1047 | { |
1038 | object *tmp, *last = 0; |
|
|
1039 | object *otmp; |
|
|
1040 | |
|
|
1041 | if (flag [FLAG_REMOVED]) |
1048 | if (flag [FLAG_REMOVED]) |
1042 | return; |
1049 | return; |
1043 | |
1050 | |
1044 | INVOKE_OBJECT (REMOVE, this); |
1051 | INVOKE_OBJECT (REMOVE, this); |
1045 | |
1052 | |
… | |
… | |
1058 | if (object *pl = visible_to ()) |
1065 | if (object *pl = visible_to ()) |
1059 | esrv_del_item (pl->contr, count); |
1066 | esrv_del_item (pl->contr, count); |
1060 | flag [FLAG_REMOVED] = true; // hack around the issue of visible_to checking flag_removed |
1067 | flag [FLAG_REMOVED] = true; // hack around the issue of visible_to checking flag_removed |
1061 | |
1068 | |
1062 | adjust_weight (env, -total_weight ()); |
1069 | adjust_weight (env, -total_weight ()); |
|
|
1070 | |
|
|
1071 | object *pl = in_player (); |
1063 | |
1072 | |
1064 | /* we set up values so that it could be inserted into |
1073 | /* we set up values so that it could be inserted into |
1065 | * the map, but we don't actually do that - it is up |
1074 | * the map, but we don't actually do that - it is up |
1066 | * to the caller to decide what we want to do. |
1075 | * to the caller to decide what we want to do. |
1067 | */ |
1076 | */ |
… | |
… | |
1079 | |
1088 | |
1080 | /* NO_FIX_PLAYER is set when a great many changes are being |
1089 | /* NO_FIX_PLAYER is set when a great many changes are being |
1081 | * made to players inventory. If set, avoiding the call |
1090 | * made to players inventory. If set, avoiding the call |
1082 | * to save cpu time. |
1091 | * to save cpu time. |
1083 | */ |
1092 | */ |
1084 | if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) |
1093 | if (pl) |
|
|
1094 | if (pl->is_player () && (glow_radius || !QUERY_FLAG (pl, FLAG_NO_FIX_PLAYER))) |
|
|
1095 | { |
1085 | otmp->update_stats (); |
1096 | pl->update_stats (); |
|
|
1097 | |
|
|
1098 | if (glow_radius && pl->is_on_map ()) |
|
|
1099 | update_all_los (pl->map, pl->x, pl->y); |
|
|
1100 | } |
1086 | } |
1101 | } |
1087 | else if (map) |
1102 | else if (map) |
1088 | { |
1103 | { |
1089 | map->dirty = true; |
1104 | map->dirty = true; |
1090 | mapspace &ms = this->ms (); |
1105 | mapspace &ms = this->ms (); |
1091 | |
1106 | |
1092 | if (object *pl = ms.player ()) |
1107 | if (object *pl = ms.player ()) |
1093 | { |
1108 | { |
1094 | if (type == PLAYER) // this == pl(!) |
1109 | if (is_player ()) |
1095 | { |
1110 | { |
|
|
1111 | if (!flag [FLAG_WIZPASS]) |
|
|
1112 | ms.smell = ++mapspace::smellcount; // remember the smell of the player |
|
|
1113 | |
1096 | // leaving a spot always closes any open container on the ground |
1114 | // leaving a spot always closes any open container on the ground |
1097 | if (container && !container->env) |
1115 | if (container && !container->env) |
1098 | // this causes spurious floorbox updates, but it ensures |
1116 | // this causes spurious floorbox updates, but it ensures |
1099 | // that the CLOSE event is being sent. |
1117 | // that the CLOSE event is being sent. |
1100 | close_container (); |
1118 | close_container (); |
1101 | |
1119 | |
1102 | --map->players; |
1120 | --map->players; |
1103 | map->touch (); |
1121 | map->touch (); |
1104 | } |
1122 | } |
1105 | else if (pl->container == this) |
1123 | else if (pl->container_ () == this) |
1106 | { |
1124 | { |
1107 | // removing a container should close it |
1125 | // removing a container should close it |
1108 | close_container (); |
1126 | close_container (); |
1109 | } |
1127 | } |
1110 | |
1128 | |
… | |
… | |
1117 | *(below ? &below->above : &ms.bot) = above; |
1135 | *(below ? &below->above : &ms.bot) = above; |
1118 | |
1136 | |
1119 | above = 0; |
1137 | above = 0; |
1120 | below = 0; |
1138 | below = 0; |
1121 | |
1139 | |
|
|
1140 | ms.invalidate (); |
|
|
1141 | |
1122 | if (map->in_memory == MAP_SAVING) |
1142 | if (map->in_memory == MAP_SAVING) |
1123 | return; |
1143 | return; |
1124 | |
1144 | |
1125 | int check_walk_off = !flag [FLAG_NO_APPLY]; |
1145 | int check_walk_off = !flag [FLAG_NO_APPLY]; |
1126 | |
1146 | |
1127 | if (object *pl = ms.player ()) |
1147 | if (object *pl = ms.player ()) |
1128 | { |
1148 | { |
1129 | if (pl->container == this) |
1149 | if (pl->container_ () == this) |
1130 | /* If a container that the player is currently using somehow gets |
1150 | /* If a container that the player is currently using somehow gets |
1131 | * removed (most likely destroyed), update the player view |
1151 | * removed (most likely destroyed), update the player view |
1132 | * appropriately. |
1152 | * appropriately. |
1133 | */ |
1153 | */ |
1134 | pl->close_container (); |
1154 | pl->close_container (); |
… | |
… | |
1138 | //TODO: update floorbox to preserve ordering |
1158 | //TODO: update floorbox to preserve ordering |
1139 | if (pl->contr->ns) |
1159 | if (pl->contr->ns) |
1140 | pl->contr->ns->floorbox_update (); |
1160 | pl->contr->ns->floorbox_update (); |
1141 | } |
1161 | } |
1142 | |
1162 | |
|
|
1163 | if (check_walk_off) |
1143 | for (tmp = ms.bot; tmp; tmp = tmp->above) |
1164 | for (object *above, *tmp = ms.bot; tmp; tmp = above) |
1144 | { |
1165 | { |
|
|
1166 | above = tmp->above; |
|
|
1167 | |
1145 | /* No point updating the players look faces if he is the object |
1168 | /* No point updating the players look faces if he is the object |
1146 | * being removed. |
1169 | * being removed. |
1147 | */ |
1170 | */ |
1148 | |
1171 | |
1149 | /* See if object moving off should effect something */ |
1172 | /* See if object moving off should effect something */ |
1150 | if (check_walk_off |
|
|
1151 | && ((move_type & tmp->move_off) |
1173 | if ((move_type & tmp->move_off) |
1152 | && (move_type & ~tmp->move_off & ~tmp->move_block) == 0)) |
1174 | && (move_type & ~tmp->move_off & ~tmp->move_block) == 0) |
1153 | { |
|
|
1154 | move_apply (tmp, this, 0); |
1175 | move_apply (tmp, this, 0); |
1155 | |
|
|
1156 | if (destroyed ()) |
|
|
1157 | LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ()); |
|
|
1158 | } |
1176 | } |
1159 | |
1177 | |
1160 | last = tmp; |
1178 | if (affects_los ()) |
1161 | } |
|
|
1162 | |
|
|
1163 | /* last == NULL if there are no objects on this space */ |
|
|
1164 | //TODO: this makes little sense, why only update the topmost object? |
|
|
1165 | if (!last) |
|
|
1166 | map->at (x, y).flags_ = 0; |
|
|
1167 | else |
|
|
1168 | update_object (last, UP_OBJ_REMOVE); |
|
|
1169 | |
|
|
1170 | if (flag [FLAG_BLOCKSVIEW] || glow_radius) |
|
|
1171 | update_all_los (map, x, y); |
1179 | update_all_los (map, x, y); |
1172 | } |
1180 | } |
1173 | } |
1181 | } |
1174 | |
1182 | |
1175 | /* |
1183 | /* |
… | |
… | |
1199 | esrv_update_item (UPD_NROF, pl, top); |
1207 | esrv_update_item (UPD_NROF, pl, top); |
1200 | |
1208 | |
1201 | op->weight = 0; // cancel the addition above |
1209 | op->weight = 0; // cancel the addition above |
1202 | op->carrying = 0; // must be 0 already |
1210 | op->carrying = 0; // must be 0 already |
1203 | |
1211 | |
1204 | op->destroy (1); |
1212 | op->destroy (); |
1205 | |
1213 | |
1206 | return top; |
1214 | return top; |
1207 | } |
1215 | } |
1208 | |
1216 | |
1209 | return 0; |
1217 | return 0; |
… | |
… | |
1271 | * just 'op' otherwise |
1279 | * just 'op' otherwise |
1272 | */ |
1280 | */ |
1273 | object * |
1281 | object * |
1274 | insert_ob_in_map (object *op, maptile *m, object *originator, int flag) |
1282 | insert_ob_in_map (object *op, maptile *m, object *originator, int flag) |
1275 | { |
1283 | { |
1276 | if (op->is_on_map ()) |
|
|
1277 | { |
|
|
1278 | LOG (llevError, "insert_ob_in_map called for object already on map"); |
|
|
1279 | abort (); |
|
|
1280 | } |
|
|
1281 | |
|
|
1282 | if (op->env) |
|
|
1283 | { |
|
|
1284 | LOG (llevError, "insert_ob_in_map called for object in an inventory (proceeding)"); |
|
|
1285 | op->remove (); |
1284 | op->remove (); |
1286 | } |
|
|
1287 | |
1285 | |
1288 | if (op->face && !face_info (op->face))//D TODO: remove soon |
1286 | if (m == &freed_map)//D TODO: remove soon |
1289 | {//D |
1287 | {//D |
1290 | LOG (llevError | logBacktrace, "op->face out of bounds: %s", op->debug_desc ());//D |
1288 | LOG (llevError | logBacktrace, "tries to insret object on freed objects map: %s", op->debug_desc ());//D |
1291 | op->face = 1;//D |
|
|
1292 | }//D |
1289 | }//D |
1293 | |
1290 | |
1294 | /* Ideally, the caller figures this out. However, it complicates a lot |
1291 | /* Ideally, the caller figures this out. However, it complicates a lot |
1295 | * of areas of callers (eg, anything that uses find_free_spot would now |
1292 | * of areas of callers (eg, anything that uses find_free_spot would now |
1296 | * need extra work |
1293 | * need extra work |
1297 | */ |
1294 | */ |
|
|
1295 | maptile *newmap = m; |
1298 | if (!xy_normalise (m, op->x, op->y)) |
1296 | if (!xy_normalise (newmap, op->x, op->y)) |
1299 | { |
1297 | { |
1300 | op->head_ ()->destroy (1);// remove head_ once all tail object destroyers found |
1298 | op->head_ ()->destroy ();// remove head_ once all tail object destroyers found |
1301 | return 0; |
1299 | return 0; |
1302 | } |
1300 | } |
1303 | |
1301 | |
1304 | if (object *more = op->more) |
1302 | if (object *more = op->more) |
1305 | if (!insert_ob_in_map (more, m, originator, flag)) |
1303 | if (!insert_ob_in_map (more, m, originator, flag)) |
1306 | return 0; |
1304 | return 0; |
1307 | |
1305 | |
1308 | CLEAR_FLAG (op, FLAG_REMOVED); |
1306 | op->flag [FLAG_REMOVED] = false; |
1309 | |
1307 | op->env = 0; |
1310 | op->map = m; |
1308 | op->map = newmap; |
|
|
1309 | |
1311 | mapspace &ms = op->ms (); |
1310 | mapspace &ms = op->ms (); |
1312 | |
1311 | |
1313 | /* this has to be done after we translate the coordinates. |
1312 | /* this has to be done after we translate the coordinates. |
1314 | */ |
1313 | */ |
1315 | if (op->nrof && !(flag & INS_NO_MERGE)) |
1314 | if (op->nrof && !(flag & INS_NO_MERGE)) |
… | |
… | |
1318 | { |
1317 | { |
1319 | // TODO: we actually want to update tmp, not op, |
1318 | // TODO: we actually want to update tmp, not op, |
1320 | // but some caller surely breaks when we return tmp |
1319 | // but some caller surely breaks when we return tmp |
1321 | // from here :/ |
1320 | // from here :/ |
1322 | op->nrof += tmp->nrof; |
1321 | op->nrof += tmp->nrof; |
1323 | tmp->destroy (1); |
1322 | tmp->destroy (); |
1324 | } |
1323 | } |
1325 | |
1324 | |
1326 | CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */ |
1325 | CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */ |
1327 | CLEAR_FLAG (op, FLAG_INV_LOCKED); |
1326 | CLEAR_FLAG (op, FLAG_INV_LOCKED); |
1328 | |
1327 | |
… | |
… | |
1336 | LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n"); |
1335 | LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n"); |
1337 | abort (); |
1336 | abort (); |
1338 | } |
1337 | } |
1339 | |
1338 | |
1340 | if (!originator->is_on_map ()) |
1339 | if (!originator->is_on_map ()) |
|
|
1340 | { |
1341 | LOG (llevDebug | logBacktrace, "insert_ob_in_map(%s) called with INS_BELOW_ORIGINATOR when originator '%s' not on map", |
1341 | LOG (llevError, "insert_ob_in_map(%s) called with INS_BELOW_ORIGINATOR when originator '%s' not on map", |
1342 | op->debug_desc (), originator->debug_desc ()); |
1342 | op->debug_desc (), originator->debug_desc ()); |
|
|
1343 | abort (); |
|
|
1344 | } |
1343 | |
1345 | |
1344 | op->above = originator; |
1346 | op->above = originator; |
1345 | op->below = originator->below; |
1347 | op->below = originator->below; |
1346 | originator->below = op; |
1348 | originator->below = op; |
1347 | |
1349 | |
… | |
… | |
1433 | op->below = top; |
1435 | op->below = top; |
1434 | *(op->above ? &op->above->below : &ms.top) = op; |
1436 | *(op->above ? &op->above->below : &ms.top) = op; |
1435 | } |
1437 | } |
1436 | } |
1438 | } |
1437 | |
1439 | |
1438 | if (op->type == PLAYER) |
1440 | if (op->is_player ()) |
1439 | { |
1441 | { |
1440 | op->contr->do_los = 1; |
1442 | op->contr->do_los = 1; |
1441 | ++op->map->players; |
1443 | ++op->map->players; |
1442 | op->map->touch (); |
1444 | op->map->touch (); |
1443 | } |
1445 | } |
… | |
… | |
1458 | * be far away from this change and not affected in any way - |
1460 | * be far away from this change and not affected in any way - |
1459 | * this should get redone to only look for players within range, |
1461 | * this should get redone to only look for players within range, |
1460 | * or just updating the P_UPTODATE for spaces within this area |
1462 | * or just updating the P_UPTODATE for spaces within this area |
1461 | * of effect may be sufficient. |
1463 | * of effect may be sufficient. |
1462 | */ |
1464 | */ |
1463 | if (op->map->darkness && (op->glow_radius != 0)) |
1465 | if (op->affects_los ()) |
|
|
1466 | { |
|
|
1467 | op->ms ().invalidate (); |
1464 | update_all_los (op->map, op->x, op->y); |
1468 | update_all_los (op->map, op->x, op->y); |
|
|
1469 | } |
1465 | |
1470 | |
1466 | /* updates flags (blocked, alive, no magic, etc) for this map space */ |
1471 | /* updates flags (blocked, alive, no magic, etc) for this map space */ |
1467 | update_object (op, UP_OBJ_INSERT); |
1472 | update_object (op, UP_OBJ_INSERT); |
1468 | |
1473 | |
1469 | INVOKE_OBJECT (INSERT, op); |
1474 | INVOKE_OBJECT (INSERT, op); |
… | |
… | |
1476 | * blocked() and wall() work properly), and these flags are updated by |
1481 | * blocked() and wall() work properly), and these flags are updated by |
1477 | * update_object(). |
1482 | * update_object(). |
1478 | */ |
1483 | */ |
1479 | |
1484 | |
1480 | /* if this is not the head or flag has been passed, don't check walk on status */ |
1485 | /* if this is not the head or flag has been passed, don't check walk on status */ |
1481 | if (!(flag & INS_NO_WALK_ON) && op->head_ () == op) |
1486 | if (!(flag & INS_NO_WALK_ON) && op->is_head ()) |
1482 | { |
1487 | { |
1483 | if (check_move_on (op, originator)) |
1488 | if (check_move_on (op, originator)) |
1484 | return 0; |
1489 | return 0; |
1485 | |
1490 | |
1486 | /* If we are a multi part object, lets work our way through the check |
1491 | /* If we are a multi part object, lets work our way through the check |
… | |
… | |
1497 | /* this function inserts an object in the map, but if it |
1502 | /* this function inserts an object in the map, but if it |
1498 | * finds an object of its own type, it'll remove that one first. |
1503 | * finds an object of its own type, it'll remove that one first. |
1499 | * op is the object to insert it under: supplies x and the map. |
1504 | * op is the object to insert it under: supplies x and the map. |
1500 | */ |
1505 | */ |
1501 | void |
1506 | void |
1502 | replace_insert_ob_in_map (const char *arch_string, object *op) |
1507 | replace_insert_ob_in_map (shstr_tmp archname, object *op) |
1503 | { |
1508 | { |
1504 | /* first search for itself and remove any old instances */ |
1509 | /* first search for itself and remove any old instances */ |
1505 | |
1510 | |
1506 | for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above) |
1511 | for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above) |
1507 | if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */ |
1512 | if (tmp->arch->archname == archname) /* same archetype */ |
1508 | tmp->destroy (1); |
1513 | tmp->destroy (); |
1509 | |
1514 | |
1510 | object *tmp = arch_to_object (archetype::find (arch_string)); |
1515 | object *tmp = arch_to_object (archetype::find (archname)); |
1511 | |
1516 | |
1512 | tmp->x = op->x; |
1517 | tmp->x = op->x; |
1513 | tmp->y = op->y; |
1518 | tmp->y = op->y; |
1514 | |
1519 | |
1515 | insert_ob_in_map (tmp, op->map, op, 0); |
1520 | insert_ob_in_map (tmp, op->map, op, 0); |
… | |
… | |
1537 | if (!nr) |
1542 | if (!nr) |
1538 | return true; |
1543 | return true; |
1539 | |
1544 | |
1540 | nr = min (nr, nrof); |
1545 | nr = min (nr, nrof); |
1541 | |
1546 | |
|
|
1547 | if (nrof > nr) |
|
|
1548 | { |
1542 | nrof -= nr; |
1549 | nrof -= nr; |
1543 | |
|
|
1544 | if (nrof) |
|
|
1545 | { |
|
|
1546 | adjust_weight (env, -weight * nr); // carrying == 0 |
1550 | adjust_weight (env, -weight * max (1, nr)); // carrying == 0 |
1547 | |
1551 | |
1548 | if (object *pl = visible_to ()) |
1552 | if (object *pl = visible_to ()) |
1549 | esrv_update_item (UPD_NROF, pl, this); |
1553 | esrv_update_item (UPD_NROF, pl, this); |
1550 | |
1554 | |
1551 | return true; |
1555 | return true; |
1552 | } |
1556 | } |
1553 | else |
1557 | else |
1554 | { |
1558 | { |
1555 | destroy (1); |
1559 | destroy (); |
1556 | return false; |
1560 | return false; |
1557 | } |
1561 | } |
1558 | } |
1562 | } |
1559 | |
1563 | |
1560 | /* |
1564 | /* |
… | |
… | |
1637 | if (object *pl = tmp->visible_to ()) |
1641 | if (object *pl = tmp->visible_to ()) |
1638 | esrv_update_item (UPD_NROF, pl, tmp); |
1642 | esrv_update_item (UPD_NROF, pl, tmp); |
1639 | |
1643 | |
1640 | adjust_weight (this, op->total_weight ()); |
1644 | adjust_weight (this, op->total_weight ()); |
1641 | |
1645 | |
1642 | op->destroy (1); |
1646 | op->destroy (); |
1643 | op = tmp; |
1647 | op = tmp; |
1644 | goto inserted; |
1648 | goto inserted; |
1645 | } |
1649 | } |
1646 | |
1650 | |
1647 | op->owner = 0; // it's his/hers now. period. |
1651 | op->owner = 0; // it's his/hers now. period. |
… | |
… | |
1665 | |
1669 | |
1666 | adjust_weight (this, op->total_weight ()); |
1670 | adjust_weight (this, op->total_weight ()); |
1667 | |
1671 | |
1668 | inserted: |
1672 | inserted: |
1669 | /* reset the light list and los of the players on the map */ |
1673 | /* reset the light list and los of the players on the map */ |
1670 | if (op->glow_radius && map && map->darkness) |
1674 | if (op->glow_radius && is_on_map ()) |
|
|
1675 | { |
|
|
1676 | update_stats (); |
1671 | update_all_los (map, x, y); |
1677 | update_all_los (map, x, y); |
1672 | |
1678 | } |
|
|
1679 | else if (is_player () && !flag [FLAG_NO_FIX_PLAYER]) |
1673 | // if this is a player's inventory, update stats |
1680 | // if this is a player's inventory, update stats |
1674 | if (type == PLAYER && !flag [FLAG_NO_FIX_PLAYER]) |
|
|
1675 | update_stats (); |
1681 | update_stats (); |
1676 | |
1682 | |
1677 | INVOKE_OBJECT (INSERT, this); |
1683 | INVOKE_OBJECT (INSERT, this); |
1678 | |
1684 | |
1679 | return op; |
1685 | return op; |
… | |
… | |
1700 | * on top. |
1706 | * on top. |
1701 | */ |
1707 | */ |
1702 | int |
1708 | int |
1703 | check_move_on (object *op, object *originator) |
1709 | check_move_on (object *op, object *originator) |
1704 | { |
1710 | { |
|
|
1711 | if (QUERY_FLAG (op, FLAG_NO_APPLY)) |
|
|
1712 | return 0; |
|
|
1713 | |
1705 | object *tmp; |
1714 | object *tmp; |
1706 | maptile *m = op->map; |
1715 | maptile *m = op->map; |
1707 | int x = op->x, y = op->y; |
1716 | int x = op->x, y = op->y; |
1708 | |
1717 | |
1709 | MoveType move_on, move_slow, move_block; |
1718 | mapspace &ms = m->at (x, y); |
1710 | |
1719 | |
1711 | if (QUERY_FLAG (op, FLAG_NO_APPLY)) |
1720 | ms.update (); |
1712 | return 0; |
|
|
1713 | |
1721 | |
1714 | move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y); |
1722 | MoveType move_on = ms.move_on; |
1715 | move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y); |
1723 | MoveType move_slow = ms.move_slow; |
1716 | move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y); |
1724 | MoveType move_block = ms.move_block; |
1717 | |
1725 | |
1718 | /* if nothing on this space will slow op down or be applied, |
1726 | /* if nothing on this space will slow op down or be applied, |
1719 | * no need to do checking below. have to make sure move_type |
1727 | * no need to do checking below. have to make sure move_type |
1720 | * is set, as lots of objects don't have it set - we treat that |
1728 | * is set, as lots of objects don't have it set - we treat that |
1721 | * as walking. |
1729 | * as walking. |
… | |
… | |
1732 | return 0; |
1740 | return 0; |
1733 | |
1741 | |
1734 | /* The objects have to be checked from top to bottom. |
1742 | /* The objects have to be checked from top to bottom. |
1735 | * Hence, we first go to the top: |
1743 | * Hence, we first go to the top: |
1736 | */ |
1744 | */ |
1737 | |
1745 | for (object *next, *tmp = ms.top; tmp; tmp = next) |
1738 | for (tmp = op->ms ().bot; tmp && tmp->above; tmp = tmp->above) |
|
|
1739 | { |
|
|
1740 | /* Trim the search when we find the first other spell effect |
|
|
1741 | * this helps performance so that if a space has 50 spell objects, |
|
|
1742 | * we don't need to check all of them. |
|
|
1743 | */ |
|
|
1744 | if ((tmp->move_type & MOVE_FLY_LOW) && QUERY_FLAG (tmp, FLAG_NO_PICK)) |
|
|
1745 | break; |
|
|
1746 | } |
1746 | { |
|
|
1747 | next = tmp->below; |
1747 | |
1748 | |
1748 | for (; tmp; tmp = tmp->below) |
|
|
1749 | { |
|
|
1750 | if (tmp == op) |
1749 | if (tmp == op) |
1751 | continue; /* Can't apply yourself */ |
1750 | continue; /* Can't apply yourself */ |
1752 | |
1751 | |
1753 | /* Check to see if one of the movement types should be slowed down. |
1752 | /* Check to see if one of the movement types should be slowed down. |
1754 | * Second check makes sure that the movement types not being slowed |
1753 | * Second check makes sure that the movement types not being slowed |
… | |
… | |
1759 | if (!QUERY_FLAG (op, FLAG_WIZPASS)) |
1758 | if (!QUERY_FLAG (op, FLAG_WIZPASS)) |
1760 | { |
1759 | { |
1761 | if ((!op->move_type && tmp->move_slow & MOVE_WALK) || |
1760 | if ((!op->move_type && tmp->move_slow & MOVE_WALK) || |
1762 | ((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0)) |
1761 | ((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0)) |
1763 | { |
1762 | { |
1764 | |
|
|
1765 | float |
|
|
1766 | diff = tmp->move_slow_penalty * fabs (op->speed); |
1763 | float diff = tmp->move_slow_penalty * fabs (op->speed); |
1767 | |
1764 | |
1768 | if (op->type == PLAYER) |
1765 | if (op->is_player ()) |
1769 | if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) || |
1766 | if ((tmp->flag [FLAG_IS_HILLY ] && find_skill_by_number (op, SK_CLIMBING)) || |
1770 | (QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN))) |
1767 | (tmp->flag [FLAG_IS_WOODED] && find_skill_by_number (op, SK_WOODSMAN))) |
1771 | diff /= 4.0; |
1768 | diff /= 4.0; |
1772 | |
1769 | |
1773 | op->speed_left -= diff; |
1770 | op->speed_left -= diff; |
1774 | } |
1771 | } |
1775 | } |
1772 | } |
… | |
… | |
1981 | * head of the object should correspond for the entire object. |
1978 | * head of the object should correspond for the entire object. |
1982 | */ |
1979 | */ |
1983 | if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block)) |
1980 | if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block)) |
1984 | continue; |
1981 | continue; |
1985 | |
1982 | |
1986 | if (ob->blocked (m, pos.x, pos.y)) |
1983 | if (ob->blocked (pos.m, pos.x, pos.y)) |
1987 | continue; |
1984 | continue; |
1988 | |
1985 | |
1989 | altern [index++] = i; |
1986 | altern [index++] = i; |
1990 | } |
1987 | } |
1991 | |
1988 | |
… | |
… | |
2059 | * there is capable of. |
2056 | * there is capable of. |
2060 | */ |
2057 | */ |
2061 | int |
2058 | int |
2062 | find_dir (maptile *m, int x, int y, object *exclude) |
2059 | find_dir (maptile *m, int x, int y, object *exclude) |
2063 | { |
2060 | { |
2064 | int i, max = SIZEOFFREE, mflags; |
2061 | int max = SIZEOFFREE, mflags; |
2065 | |
|
|
2066 | sint16 nx, ny; |
|
|
2067 | object *tmp; |
|
|
2068 | maptile *mp; |
|
|
2069 | |
|
|
2070 | MoveType blocked, move_type; |
2062 | MoveType move_type; |
2071 | |
2063 | |
2072 | if (exclude && exclude->head_ () != exclude) |
2064 | if (exclude && exclude->head_ () != exclude) |
2073 | { |
2065 | { |
2074 | exclude = exclude->head; |
2066 | exclude = exclude->head; |
2075 | move_type = exclude->move_type; |
2067 | move_type = exclude->move_type; |
… | |
… | |
2078 | { |
2070 | { |
2079 | /* If we don't have anything, presume it can use all movement types. */ |
2071 | /* If we don't have anything, presume it can use all movement types. */ |
2080 | move_type = MOVE_ALL; |
2072 | move_type = MOVE_ALL; |
2081 | } |
2073 | } |
2082 | |
2074 | |
2083 | for (i = 1; i < max; i++) |
2075 | for (int i = 1; i < max; i++) |
2084 | { |
2076 | { |
2085 | mp = m; |
2077 | mapxy pos (m, x, y); |
2086 | nx = x + freearr_x[i]; |
2078 | pos.move (i); |
2087 | ny = y + freearr_y[i]; |
|
|
2088 | |
2079 | |
2089 | mflags = get_map_flags (m, &mp, nx, ny, &nx, &ny); |
2080 | if (!pos.normalise ()) |
2090 | |
|
|
2091 | if (mflags & P_OUT_OF_MAP) |
|
|
2092 | max = maxfree[i]; |
2081 | max = maxfree[i]; |
2093 | else |
2082 | else |
2094 | { |
2083 | { |
2095 | mapspace &ms = mp->at (nx, ny); |
2084 | mapspace &ms = *pos; |
2096 | |
2085 | |
2097 | blocked = ms.move_block; |
|
|
2098 | |
|
|
2099 | if ((move_type & blocked) == move_type) |
2086 | if ((move_type & ms.move_block) == move_type) |
2100 | max = maxfree[i]; |
2087 | max = maxfree [i]; |
2101 | else if (mflags & P_IS_ALIVE) |
2088 | else if (ms.flags () & P_IS_ALIVE) |
2102 | { |
2089 | { |
2103 | for (tmp = ms.bot; tmp; tmp = tmp->above) |
2090 | for (object *tmp = ms.bot; tmp; tmp = tmp->above) |
2104 | if ((tmp->flag [FLAG_MONSTER] || tmp->type == PLAYER) |
2091 | if ((tmp->flag [FLAG_MONSTER] || tmp->is_player ()) |
2105 | && (tmp != exclude || (tmp->head_ () != tmp && tmp->head_ () != exclude))) |
2092 | && (tmp != exclude || (tmp->head_ () != tmp && tmp->head_ () != exclude))) |
2106 | break; |
|
|
2107 | |
|
|
2108 | if (tmp) |
|
|
2109 | return freedir[i]; |
2093 | return freedir [i]; |
2110 | } |
2094 | } |
2111 | } |
2095 | } |
2112 | } |
2096 | } |
2113 | |
2097 | |
2114 | return 0; |
2098 | return 0; |
… | |
… | |
2189 | * This basically means that if direction is 15, then it could either go |
2173 | * This basically means that if direction is 15, then it could either go |
2190 | * direction 4, 14, or 16 to get back to where we are. |
2174 | * direction 4, 14, or 16 to get back to where we are. |
2191 | * Moved from spell_util.c to object.c with the other related direction |
2175 | * Moved from spell_util.c to object.c with the other related direction |
2192 | * functions. |
2176 | * functions. |
2193 | */ |
2177 | */ |
2194 | int reduction_dir[SIZEOFFREE][3] = { |
2178 | const int reduction_dir[SIZEOFFREE][3] = { |
2195 | {0, 0, 0}, /* 0 */ |
2179 | {0, 0, 0}, /* 0 */ |
2196 | {0, 0, 0}, /* 1 */ |
2180 | {0, 0, 0}, /* 1 */ |
2197 | {0, 0, 0}, /* 2 */ |
2181 | {0, 0, 0}, /* 2 */ |
2198 | {0, 0, 0}, /* 3 */ |
2182 | {0, 0, 0}, /* 3 */ |
2199 | {0, 0, 0}, /* 4 */ |
2183 | {0, 0, 0}, /* 4 */ |
… | |
… | |
2295 | int |
2279 | int |
2296 | can_pick (const object *who, const object *item) |
2280 | can_pick (const object *who, const object *item) |
2297 | { |
2281 | { |
2298 | return /*QUERY_FLAG(who,FLAG_WIZ)|| */ |
2282 | return /*QUERY_FLAG(who,FLAG_WIZ)|| */ |
2299 | (item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) && |
2283 | (item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) && |
2300 | !QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->type == PLAYER || item->weight < who->weight / 3)); |
2284 | !QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->is_player () || item->weight < who->weight / 3)); |
2301 | } |
2285 | } |
2302 | |
2286 | |
2303 | /* |
2287 | /* |
2304 | * create clone from object to another |
2288 | * create clone from object to another |
2305 | */ |
2289 | */ |
… | |
… | |
2337 | return tmp; |
2321 | return tmp; |
2338 | |
2322 | |
2339 | return 0; |
2323 | return 0; |
2340 | } |
2324 | } |
2341 | |
2325 | |
2342 | const shstr & |
2326 | shstr_tmp |
2343 | object::kv_get (const shstr &key) const |
2327 | object::kv_get (shstr_tmp key) const |
2344 | { |
2328 | { |
2345 | for (key_value *kv = key_values; kv; kv = kv->next) |
2329 | for (key_value *kv = key_values; kv; kv = kv->next) |
2346 | if (kv->key == key) |
2330 | if (kv->key == key) |
2347 | return kv->value; |
2331 | return kv->value; |
2348 | |
2332 | |
2349 | return shstr_null; |
2333 | return shstr (); |
2350 | } |
2334 | } |
2351 | |
2335 | |
2352 | void |
2336 | void |
2353 | object::kv_set (const shstr &key, const shstr &value) |
2337 | object::kv_set (shstr_tmp key, shstr_tmp value) |
2354 | { |
2338 | { |
2355 | for (key_value *kv = key_values; kv; kv = kv->next) |
2339 | for (key_value *kv = key_values; kv; kv = kv->next) |
2356 | if (kv->key == key) |
2340 | if (kv->key == key) |
2357 | { |
2341 | { |
2358 | kv->value = value; |
2342 | kv->value = value; |
… | |
… | |
2367 | |
2351 | |
2368 | key_values = kv; |
2352 | key_values = kv; |
2369 | } |
2353 | } |
2370 | |
2354 | |
2371 | void |
2355 | void |
2372 | object::kv_del (const shstr &key) |
2356 | object::kv_del (shstr_tmp key) |
2373 | { |
2357 | { |
2374 | for (key_value **kvp = &key_values; *kvp; kvp = &(*kvp)->next) |
2358 | for (key_value **kvp = &key_values; *kvp; kvp = &(*kvp)->next) |
2375 | if ((*kvp)->key == key) |
2359 | if ((*kvp)->key == key) |
2376 | { |
2360 | { |
2377 | key_value *kv = *kvp; |
2361 | key_value *kv = *kvp; |
… | |
… | |
2508 | container = 0; |
2492 | container = 0; |
2509 | |
2493 | |
2510 | // client needs item update to make it work, client bug requires this to be separate |
2494 | // client needs item update to make it work, client bug requires this to be separate |
2511 | esrv_update_item (UPD_FLAGS, this, old_container); |
2495 | esrv_update_item (UPD_FLAGS, this, old_container); |
2512 | |
2496 | |
2513 | new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container)); |
2497 | new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", old_container->query_name ()); |
2514 | play_sound (sound_find ("chest_close")); |
2498 | play_sound (sound_find ("chest_close")); |
2515 | } |
2499 | } |
2516 | |
2500 | |
2517 | if (new_container) |
2501 | if (new_container) |
2518 | { |
2502 | { |
… | |
… | |
2528 | closer->flag [FLAG_NO_MAP_SAVE] = 1; |
2512 | closer->flag [FLAG_NO_MAP_SAVE] = 1; |
2529 | new_container->insert (closer); |
2513 | new_container->insert (closer); |
2530 | } |
2514 | } |
2531 | #endif |
2515 | #endif |
2532 | |
2516 | |
2533 | new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container)); |
2517 | new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", new_container->query_name ()); |
2534 | |
2518 | |
2535 | // make sure the container is available, client bug requires this to be separate |
2519 | // make sure the container is available, client bug requires this to be separate |
2536 | esrv_send_item (this, new_container); |
2520 | esrv_send_item (this, new_container); |
2537 | |
2521 | |
2538 | new_container->flag [FLAG_APPLIED] = true; |
2522 | new_container->flag [FLAG_APPLIED] = true; |
… | |
… | |
2546 | // else if (!old_container->env && contr && contr->ns) |
2530 | // else if (!old_container->env && contr && contr->ns) |
2547 | // contr->ns->floorbox_reset (); |
2531 | // contr->ns->floorbox_reset (); |
2548 | } |
2532 | } |
2549 | |
2533 | |
2550 | object * |
2534 | object * |
2551 | object::force_find (const shstr name) |
2535 | object::force_find (shstr_tmp name) |
2552 | { |
2536 | { |
2553 | /* cycle through his inventory to look for the MARK we want to |
2537 | /* cycle through his inventory to look for the MARK we want to |
2554 | * place |
2538 | * place |
2555 | */ |
2539 | */ |
2556 | for (object *tmp = inv; tmp; tmp = tmp->below) |
2540 | for (object *tmp = inv; tmp; tmp = tmp->below) |
… | |
… | |
2558 | return splay (tmp); |
2542 | return splay (tmp); |
2559 | |
2543 | |
2560 | return 0; |
2544 | return 0; |
2561 | } |
2545 | } |
2562 | |
2546 | |
|
|
2547 | //-GPL |
|
|
2548 | |
2563 | void |
2549 | void |
|
|
2550 | object::force_set_timer (int duration) |
|
|
2551 | { |
|
|
2552 | this->duration = 1; |
|
|
2553 | this->speed_left = -1.f; |
|
|
2554 | |
|
|
2555 | this->set_speed (duration ? 1.f / duration : 0.f); |
|
|
2556 | } |
|
|
2557 | |
|
|
2558 | object * |
2564 | object::force_add (const shstr name, int duration) |
2559 | object::force_add (shstr_tmp name, int duration) |
2565 | { |
2560 | { |
2566 | if (object *force = force_find (name)) |
2561 | if (object *force = force_find (name)) |
2567 | force->destroy (); |
2562 | force->destroy (); |
2568 | |
2563 | |
2569 | object *force = get_archetype (FORCE_NAME); |
2564 | object *force = get_archetype (FORCE_NAME); |
2570 | |
2565 | |
2571 | force->slaying = name; |
2566 | force->slaying = name; |
2572 | force->stats.food = 1; |
2567 | force->force_set_timer (duration); |
2573 | force->speed_left = -1.f; |
|
|
2574 | |
|
|
2575 | force->set_speed (duration ? 1.f / duration : 0.f); |
|
|
2576 | force->flag [FLAG_IS_USED_UP] = true; |
|
|
2577 | force->flag [FLAG_APPLIED] = true; |
2568 | force->flag [FLAG_APPLIED] = true; |
2578 | |
2569 | |
2579 | insert (force); |
2570 | return insert (force); |
2580 | } |
2571 | } |
2581 | |
2572 | |
2582 | void |
2573 | void |
2583 | object::play_sound (faceidx sound) |
2574 | object::play_sound (faceidx sound) const |
2584 | { |
2575 | { |
2585 | if (!sound) |
2576 | if (!sound) |
2586 | return; |
2577 | return; |
2587 | |
2578 | |
2588 | if (flag [FLAG_REMOVED]) |
2579 | if (is_on_map ()) |
|
|
2580 | map->play_sound (sound, x, y); |
|
|
2581 | else if (object *pl = in_player ()) |
|
|
2582 | pl->contr->play_sound (sound); |
|
|
2583 | } |
|
|
2584 | |
|
|
2585 | void |
|
|
2586 | object::say_msg (const char *msg) const |
|
|
2587 | { |
|
|
2588 | if (is_on_map ()) |
|
|
2589 | map->say_msg (msg, x, y); |
|
|
2590 | else if (object *pl = in_player ()) |
|
|
2591 | pl->contr->play_sound (sound); |
|
|
2592 | } |
|
|
2593 | |
|
|
2594 | void |
|
|
2595 | object::make_noise () |
|
|
2596 | { |
|
|
2597 | // we do not model noise in the map, so instead put |
|
|
2598 | // a temporary light into the noise source |
|
|
2599 | // could use the map instead, but that's less reliable for our |
|
|
2600 | // goal, which is to make invisibility a bit harder to exploit |
|
|
2601 | |
|
|
2602 | // currently only works sensibly for players |
|
|
2603 | if (!is_player ()) |
2589 | return; |
2604 | return; |
2590 | |
2605 | |
2591 | if (env) |
2606 | // find old force, or create new one |
2592 | { |
2607 | object *force = force_find (shstr_noise_force); |
2593 | if (object *pl = in_player ()) |
2608 | |
2594 | pl->contr->play_sound (sound); |
2609 | if (force) |
2595 | } |
2610 | force->speed_left = -1.f; // patch old speed up |
2596 | else |
2611 | else |
2597 | map->play_sound (sound, x, y); |
2612 | { |
2598 | } |
2613 | force = archetype::get (shstr_noise_force); |
2599 | |
2614 | |
|
|
2615 | force->slaying = shstr_noise_force; |
|
|
2616 | force->stats.food = 1; |
|
|
2617 | force->speed_left = -1.f; |
|
|
2618 | |
|
|
2619 | force->set_speed (1.f / 4.f); |
|
|
2620 | force->flag [FLAG_IS_USED_UP] = true; |
|
|
2621 | force->flag [FLAG_APPLIED] = true; |
|
|
2622 | |
|
|
2623 | insert (force); |
|
|
2624 | } |
|
|
2625 | } |
|
|
2626 | |