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