1 | /* |
1 | /* |
2 | * This file is part of Deliantra, the Roguelike Realtime MMORPG. |
2 | * This file is part of Deliantra, the Roguelike Realtime MMORPG. |
3 | * |
3 | * |
4 | * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team |
4 | * Copyright (©) 2005,2006,2007,2008,2009 Marc Alexander Lehmann / Robin Redeker / the Deliantra team |
5 | * Copyright (©) 2001,2007 Mark Wedel & Crossfire Development Team |
5 | * Copyright (©) 2001,2007 Mark Wedel & Crossfire Development Team |
6 | * Copyright (©) 1992,2007 Frank Tore Johansen |
6 | * Copyright (©) 1992,2007 Frank Tore Johansen |
7 | * |
7 | * |
8 | * Deliantra is free software: you can redistribute it and/or modify |
8 | * Deliantra is free software: you can redistribute it and/or modify it under |
9 | * it under the terms of the GNU General Public License as published by |
9 | * the terms of the Affero GNU General Public License as published by the |
10 | * the Free Software Foundation, either version 3 of the License, or |
10 | * Free Software Foundation, either version 3 of the License, or (at your |
11 | * (at your option) any later version. |
11 | * option) any later version. |
12 | * |
12 | * |
13 | * This program is distributed in the hope that it will be useful, |
13 | * This program is distributed in the hope that it will be useful, |
14 | * but WITHOUT ANY WARRANTY; without even the implied warranty of |
14 | * but WITHOUT ANY WARRANTY; without even the implied warranty of |
15 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
15 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
16 | * GNU General Public License for more details. |
16 | * GNU General Public License for more details. |
17 | * |
17 | * |
18 | * You should have received a copy of the GNU General Public License |
18 | * You should have received a copy of the Affero GNU General Public License |
19 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
19 | * and the GNU General Public License along with this program. If not, see |
|
|
20 | * <http://www.gnu.org/licenses/>. |
20 | * |
21 | * |
21 | * The authors can be reached via e-mail to <support@deliantra.net> |
22 | * The authors can be reached via e-mail to <support@deliantra.net> |
22 | */ |
23 | */ |
23 | |
24 | |
24 | #include <global.h> |
25 | #include <global.h> |
… | |
… | |
32 | #include <bitset> |
33 | #include <bitset> |
33 | |
34 | |
34 | UUID UUID::cur; |
35 | UUID UUID::cur; |
35 | static uint64_t seq_next_save; |
36 | static uint64_t seq_next_save; |
36 | static const uint64 UUID_GAP = 1<<19; |
37 | static const uint64 UUID_GAP = 1<<19; |
|
|
38 | uint32_t mapspace::smellcount = 10000; |
37 | |
39 | |
38 | objectvec objects; |
40 | objectvec objects; |
39 | activevec actives; |
41 | activevec actives; |
|
|
42 | |
|
|
43 | //+GPL |
40 | |
44 | |
41 | short freearr_x[SIZEOFFREE] = { |
45 | short freearr_x[SIZEOFFREE] = { |
42 | 0, |
46 | 0, |
43 | 0, 1, 1, 1, 0, -1, -1, -1, |
47 | 0, 1, 1, 1, 0, -1, -1, -1, |
44 | 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, -2, -2, -2, -1, |
48 | 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, -2, -2, -2, -1, |
… | |
… | |
48 | 0, |
52 | 0, |
49 | -1, -1, 0, 1, 1, 1, 0, -1, |
53 | -1, -1, 0, 1, 1, 1, 0, -1, |
50 | -2, -2, -2, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, |
54 | -2, -2, -2, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, |
51 | -3, -3, -3, -3, -2, -1, 0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3 |
55 | -3, -3, -3, -3, -2, -1, 0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3 |
52 | }; |
56 | }; |
53 | int maxfree[SIZEOFFREE] = { |
|
|
54 | 0, |
|
|
55 | 9, 10, 13, 14, 17, 18, 21, 22, |
|
|
56 | 25, 26, 27, 30, 31, 32, 33, 36, 37, 39, 39, 42, 43, 44, 45, 48, |
|
|
57 | 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49 |
|
|
58 | }; |
|
|
59 | int freedir[SIZEOFFREE] = { |
57 | int freedir[SIZEOFFREE] = { |
60 | 0, |
58 | 0, |
61 | 1, 2, 3, 4, 5, 6, 7, 8, |
59 | 1, 2, 3, 4, 5, 6, 7, 8, |
62 | 1, 2, 2, 2, 3, 4, 4, 4, 5, 6, 6, 6, 7, 8, 8, 8, |
60 | 1, 2, 2, 2, 3, 4, 4, 4, 5, 6, 6, 6, 7, 8, 8, 8, |
63 | 1, 2, 2, 2, 2, 2, 3, 4, 4, 4, 4, 4, 5, 6, 6, 6, 6, 6, 7, 8, 8, 8, 8, 8 |
61 | 1, 2, 2, 2, 2, 2, 3, 4, 4, 4, 4, 4, 5, 6, 6, 6, 6, 6, 7, 8, 8, 8, 8, 8 |
|
|
62 | }; |
|
|
63 | |
|
|
64 | static int maxfree[SIZEOFFREE] = { |
|
|
65 | 0, |
|
|
66 | 9, 10, 13, 14, 17, 18, 21, 22, |
|
|
67 | 25, 26, 27, 30, 31, 32, 33, 36, 37, 39, 39, 42, 43, 44, 45, 48, |
|
|
68 | 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49 |
64 | }; |
69 | }; |
65 | |
70 | |
66 | static void |
71 | static void |
67 | write_uuid (uval64 skip, bool sync) |
72 | write_uuid (uval64 skip, bool sync) |
68 | { |
73 | { |
… | |
… | |
323 | { |
328 | { |
324 | // see if we are in a container of sorts |
329 | // see if we are in a container of sorts |
325 | if (env) |
330 | if (env) |
326 | { |
331 | { |
327 | // the player inventory itself is always visible |
332 | // the player inventory itself is always visible |
328 | if (env->type == PLAYER) |
333 | if (env->is_player ()) |
329 | return env; |
334 | return env; |
330 | |
335 | |
331 | // else a player could have our env open |
336 | // else a player could have our env open |
332 | object *envest = env->outer_env (); |
337 | object *envest = env->outer_env_or_self (); |
333 | |
338 | |
334 | // the player itself is always on a map, so we will find him here |
339 | // the player itself is always on a map, so we will find him here |
335 | // even if our inv is in a player. |
340 | // even if our inv is in a player. |
336 | if (envest->is_on_map ()) |
341 | if (envest->is_on_map ()) |
337 | if (object *pl = envest->ms ().player ()) |
342 | if (object *pl = envest->ms ().player ()) |
338 | if (pl->container == env) |
343 | if (pl->container_ () == env) |
339 | return pl; |
344 | return pl; |
340 | } |
345 | } |
341 | else |
346 | else |
342 | { |
347 | { |
343 | // maybe there is a player standing on the same mapspace |
348 | // maybe there is a player standing on the same mapspace |
344 | // this will catch the case where "this" is a player |
349 | // this will catch the case where "this" is a player |
345 | if (object *pl = ms ().player ()) |
350 | if (object *pl = ms ().player ()) |
346 | if ((!pl->container && pl->contr->ns && !pl->contr->ns->update_look) |
351 | if ((pl->contr->ns && !pl->container_ () && !pl->contr->ns->update_look) |
347 | || this == pl->container) |
352 | || pl->container_ () == this) |
348 | return pl; |
353 | return pl; |
349 | } |
354 | } |
350 | } |
355 | } |
351 | |
356 | |
352 | return 0; |
357 | return 0; |
… | |
… | |
430 | object_freezer freezer; |
435 | object_freezer freezer; |
431 | op->write (freezer); |
436 | op->write (freezer); |
432 | return freezer.as_string (); |
437 | return freezer.as_string (); |
433 | } |
438 | } |
434 | |
439 | |
|
|
440 | char * |
|
|
441 | object::as_string () |
|
|
442 | { |
|
|
443 | return dump_object (this); |
|
|
444 | } |
|
|
445 | |
435 | /* |
446 | /* |
436 | * get_nearest_part(multi-object, object 2) returns the part of the |
447 | * get_nearest_part(multi-object, object 2) returns the part of the |
437 | * multi-object 1 which is closest to the second object. |
448 | * multi-object 1 which is closest to the second object. |
438 | * If it's not a multi-object, it is returned. |
449 | * If it's not a multi-object, it is returned. |
439 | */ |
450 | */ |
440 | object * |
451 | static object * |
441 | get_nearest_part (object *op, const object *pl) |
452 | get_nearest_part (object *op, const object *pl) |
442 | { |
453 | { |
443 | object *tmp, *closest; |
454 | object *tmp, *closest; |
444 | int last_dist, i; |
455 | int last_dist, i; |
445 | |
456 | |
… | |
… | |
554 | update_stats (); |
565 | update_stats (); |
555 | |
566 | |
556 | new_draw_info_format (NDI_UNIQUE, 0, this, |
567 | new_draw_info_format (NDI_UNIQUE, 0, this, |
557 | "You try to balance all your items at once, " |
568 | "You try to balance all your items at once, " |
558 | "but the %s is just too much for your body. " |
569 | "but the %s is just too much for your body. " |
559 | "[You need to unapply some items first.]", &ob->name); |
570 | "[You need to unapply some items first - use the 'body' command to see " |
|
|
571 | "how many items you cna wera on a specific body part.]", &ob->name); |
560 | return false; |
572 | return false; |
561 | } |
573 | } |
562 | |
574 | |
563 | //new_draw_info_format (NDI_UNIQUE, 0, this, "You switch to your %s.", &ob->name); |
575 | //new_draw_info_format (NDI_UNIQUE, 0, this, "You switch to your %s.", &ob->name); |
564 | } |
576 | } |
… | |
… | |
758 | else if (action == UP_OBJ_INSERT) |
770 | else if (action == UP_OBJ_INSERT) |
759 | { |
771 | { |
760 | // this is likely overkill, TODO: revisit (schmorp) |
772 | // this is likely overkill, TODO: revisit (schmorp) |
761 | if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW)) |
773 | if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW)) |
762 | || (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC)) |
774 | || (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC)) |
763 | || (op->type == PLAYER && !(m.flags_ & P_PLAYER)) |
775 | || (op->is_player () && !(m.flags_ & P_PLAYER)) |
764 | || (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE)) |
776 | || (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE)) |
765 | || (QUERY_FLAG (op, FLAG_ALIVE) && !(m.flags_ & P_IS_ALIVE)) |
777 | || (QUERY_FLAG (op, FLAG_ALIVE) && !(m.flags_ & P_IS_ALIVE)) |
766 | || (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC)) |
778 | || (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC)) |
767 | || (m.move_on | op->move_on ) != m.move_on |
779 | || (m.move_on | op->move_on ) != m.move_on |
768 | || (m.move_off | op->move_off ) != m.move_off |
780 | || (m.move_off | op->move_off ) != m.move_off |
… | |
… | |
791 | |
803 | |
792 | object::object () |
804 | object::object () |
793 | { |
805 | { |
794 | SET_FLAG (this, FLAG_REMOVED); |
806 | SET_FLAG (this, FLAG_REMOVED); |
795 | |
807 | |
796 | expmul = 1.0; |
808 | //expmul = 1.0; declared const for the time being |
797 | face = blank_face; |
809 | face = blank_face; |
798 | } |
810 | } |
799 | |
811 | |
800 | object::~object () |
812 | object::~object () |
801 | { |
813 | { |
… | |
… | |
830 | { |
842 | { |
831 | /* If already on active list, don't do anything */ |
843 | /* If already on active list, don't do anything */ |
832 | if (active) |
844 | if (active) |
833 | return; |
845 | return; |
834 | |
846 | |
835 | if (has_active_speed () && flag [FLAG_FREED]) LOG (llevError | logBacktrace, "BUG: tried to activate freed object %s\n", debug_desc ());//D |
|
|
836 | if (has_active_speed () && flag [FLAG_DEBUG]) LOG (llevError | logBacktrace, "BUG: tried to activate DEBUG object %s\n", debug_desc ());//D temp |
|
|
837 | |
|
|
838 | if (has_active_speed ()) |
847 | if (has_active_speed ()) |
|
|
848 | { |
|
|
849 | if (flag [FLAG_FREED]) |
|
|
850 | LOG (llevError | logBacktrace, "BUG: tried to activate freed object %s\n", debug_desc ());//D |
|
|
851 | |
839 | actives.insert (this); |
852 | actives.insert (this); |
|
|
853 | } |
840 | } |
854 | } |
841 | |
855 | |
842 | void |
856 | void |
843 | object::activate_recursive () |
857 | object::activate_recursive () |
844 | { |
858 | { |
… | |
… | |
962 | |
976 | |
963 | void |
977 | void |
964 | object::do_destroy () |
978 | object::do_destroy () |
965 | { |
979 | { |
966 | if (flag [FLAG_IS_LINKED]) |
980 | if (flag [FLAG_IS_LINKED]) |
967 | remove_button_link (this); |
981 | remove_link (); |
968 | |
982 | |
969 | if (flag [FLAG_FRIENDLY]) |
983 | if (flag [FLAG_FRIENDLY]) |
970 | remove_friendly_object (this); |
984 | remove_friendly_object (this); |
971 | |
985 | |
972 | remove (); |
986 | remove (); |
… | |
… | |
1030 | * the previous environment. |
1044 | * the previous environment. |
1031 | */ |
1045 | */ |
1032 | void |
1046 | void |
1033 | object::do_remove () |
1047 | object::do_remove () |
1034 | { |
1048 | { |
1035 | object *tmp, *last = 0; |
|
|
1036 | object *otmp; |
|
|
1037 | |
|
|
1038 | if (flag [FLAG_REMOVED]) |
1049 | if (flag [FLAG_REMOVED]) |
1039 | return; |
1050 | return; |
1040 | |
1051 | |
1041 | INVOKE_OBJECT (REMOVE, this); |
1052 | INVOKE_OBJECT (REMOVE, this); |
1042 | |
1053 | |
… | |
… | |
1079 | /* 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 |
1080 | * made to players inventory. If set, avoiding the call |
1091 | * made to players inventory. If set, avoiding the call |
1081 | * to save cpu time. |
1092 | * to save cpu time. |
1082 | */ |
1093 | */ |
1083 | if (pl) |
1094 | if (pl) |
1084 | if (pl->contr && !QUERY_FLAG (pl, FLAG_NO_FIX_PLAYER)) |
1095 | if (pl->is_player () && (glow_radius || !QUERY_FLAG (pl, FLAG_NO_FIX_PLAYER))) |
1085 | { |
1096 | { |
1086 | pl->update_stats (); |
1097 | pl->update_stats (); |
1087 | |
1098 | |
1088 | if (affects_los () && pl->is_on_map () && pl->map->darkness) |
1099 | if (glow_radius && pl->is_on_map ()) |
1089 | update_all_los (pl->map, pl->x, pl->y); |
1100 | update_all_los (pl->map, pl->x, pl->y); |
1090 | } |
1101 | } |
1091 | } |
1102 | } |
1092 | else if (map) |
1103 | else if (map) |
1093 | { |
1104 | { |
1094 | map->dirty = true; |
1105 | map->dirty = true; |
1095 | mapspace &ms = this->ms (); |
1106 | mapspace &ms = this->ms (); |
1096 | |
1107 | |
1097 | if (object *pl = ms.player ()) |
1108 | if (object *pl = ms.player ()) |
1098 | { |
1109 | { |
1099 | if (type == PLAYER) // this == pl(!) |
1110 | if (is_player ()) |
1100 | { |
1111 | { |
|
|
1112 | if (!flag [FLAG_WIZPASS]) |
|
|
1113 | ms.smell = ++mapspace::smellcount; // remember the smell of the player |
|
|
1114 | |
1101 | // leaving a spot always closes any open container on the ground |
1115 | // leaving a spot always closes any open container on the ground |
1102 | if (container && !container->env) |
1116 | if (container && !container->env) |
1103 | // this causes spurious floorbox updates, but it ensures |
1117 | // this causes spurious floorbox updates, but it ensures |
1104 | // that the CLOSE event is being sent. |
1118 | // that the CLOSE event is being sent. |
1105 | close_container (); |
1119 | close_container (); |
1106 | |
1120 | |
1107 | --map->players; |
1121 | --map->players; |
1108 | map->touch (); |
1122 | map->touch (); |
1109 | } |
1123 | } |
1110 | else if (pl->container == this) |
1124 | else if (pl->container_ () == this) |
1111 | { |
1125 | { |
1112 | // removing a container should close it |
1126 | // removing a container should close it |
1113 | close_container (); |
1127 | close_container (); |
1114 | } |
1128 | } |
1115 | |
1129 | |
… | |
… | |
1131 | |
1145 | |
1132 | int check_walk_off = !flag [FLAG_NO_APPLY]; |
1146 | int check_walk_off = !flag [FLAG_NO_APPLY]; |
1133 | |
1147 | |
1134 | if (object *pl = ms.player ()) |
1148 | if (object *pl = ms.player ()) |
1135 | { |
1149 | { |
1136 | if (pl->container == this) |
1150 | if (pl->container_ () == this) |
1137 | /* If a container that the player is currently using somehow gets |
1151 | /* If a container that the player is currently using somehow gets |
1138 | * removed (most likely destroyed), update the player view |
1152 | * removed (most likely destroyed), update the player view |
1139 | * appropriately. |
1153 | * appropriately. |
1140 | */ |
1154 | */ |
1141 | pl->close_container (); |
1155 | pl->close_container (); |
… | |
… | |
1145 | //TODO: update floorbox to preserve ordering |
1159 | //TODO: update floorbox to preserve ordering |
1146 | if (pl->contr->ns) |
1160 | if (pl->contr->ns) |
1147 | pl->contr->ns->floorbox_update (); |
1161 | pl->contr->ns->floorbox_update (); |
1148 | } |
1162 | } |
1149 | |
1163 | |
|
|
1164 | if (check_walk_off) |
1150 | for (tmp = ms.bot; tmp; tmp = tmp->above) |
1165 | for (object *above, *tmp = ms.bot; tmp; tmp = above) |
1151 | { |
1166 | { |
|
|
1167 | above = tmp->above; |
|
|
1168 | |
1152 | /* No point updating the players look faces if he is the object |
1169 | /* No point updating the players look faces if he is the object |
1153 | * being removed. |
1170 | * being removed. |
1154 | */ |
1171 | */ |
1155 | |
1172 | |
1156 | /* See if object moving off should effect something */ |
1173 | /* See if object moving off should effect something */ |
1157 | if (check_walk_off |
|
|
1158 | && ((move_type & tmp->move_off) |
1174 | if ((move_type & tmp->move_off) |
1159 | && (move_type & ~tmp->move_off & ~tmp->move_block) == 0)) |
1175 | && (move_type & ~tmp->move_off & ~tmp->move_block) == 0) |
1160 | { |
|
|
1161 | move_apply (tmp, this, 0); |
1176 | move_apply (tmp, this, 0); |
1162 | |
|
|
1163 | if (destroyed ()) |
|
|
1164 | LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ()); |
|
|
1165 | } |
1177 | } |
1166 | |
1178 | |
1167 | last = tmp; |
1179 | if (affects_los ()) |
1168 | } |
|
|
1169 | |
|
|
1170 | if (map->darkness && affects_los ()) |
|
|
1171 | update_all_los (map, x, y); |
1180 | update_all_los (map, x, y); |
1172 | } |
1181 | } |
1173 | } |
1182 | } |
1174 | |
1183 | |
1175 | /* |
1184 | /* |
… | |
… | |
1282 | |
1291 | |
1283 | /* Ideally, the caller figures this out. However, it complicates a lot |
1292 | /* Ideally, the caller figures this out. However, it complicates a lot |
1284 | * of areas of callers (eg, anything that uses find_free_spot would now |
1293 | * of areas of callers (eg, anything that uses find_free_spot would now |
1285 | * need extra work |
1294 | * need extra work |
1286 | */ |
1295 | */ |
|
|
1296 | maptile *newmap = m; |
1287 | if (!xy_normalise (m, op->x, op->y)) |
1297 | if (!xy_normalise (newmap, op->x, op->y)) |
1288 | { |
1298 | { |
1289 | op->head_ ()->destroy ();// remove head_ once all tail object destroyers found |
1299 | op->head_ ()->destroy ();// remove head_ once all tail object destroyers found |
1290 | return 0; |
1300 | return 0; |
1291 | } |
1301 | } |
1292 | |
1302 | |
1293 | if (object *more = op->more) |
1303 | if (object *more = op->more) |
1294 | if (!insert_ob_in_map (more, m, originator, flag)) |
1304 | if (!insert_ob_in_map (more, m, originator, flag)) |
1295 | return 0; |
1305 | return 0; |
1296 | |
1306 | |
1297 | CLEAR_FLAG (op, FLAG_REMOVED); |
1307 | op->flag [FLAG_REMOVED] = false; |
1298 | |
1308 | op->env = 0; |
1299 | op->map = m; |
1309 | op->map = newmap; |
|
|
1310 | |
1300 | mapspace &ms = op->ms (); |
1311 | mapspace &ms = op->ms (); |
1301 | |
1312 | |
1302 | /* this has to be done after we translate the coordinates. |
1313 | /* this has to be done after we translate the coordinates. |
1303 | */ |
1314 | */ |
1304 | if (op->nrof && !(flag & INS_NO_MERGE)) |
1315 | if (op->nrof && !(flag & INS_NO_MERGE)) |
… | |
… | |
1325 | LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n"); |
1336 | LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n"); |
1326 | abort (); |
1337 | abort (); |
1327 | } |
1338 | } |
1328 | |
1339 | |
1329 | if (!originator->is_on_map ()) |
1340 | if (!originator->is_on_map ()) |
|
|
1341 | { |
1330 | LOG (llevDebug | logBacktrace, "insert_ob_in_map(%s) called with INS_BELOW_ORIGINATOR when originator '%s' not on map", |
1342 | LOG (llevError, "insert_ob_in_map(%s) called with INS_BELOW_ORIGINATOR when originator '%s' not on map", |
1331 | op->debug_desc (), originator->debug_desc ()); |
1343 | op->debug_desc (), originator->debug_desc ()); |
|
|
1344 | abort (); |
|
|
1345 | } |
1332 | |
1346 | |
1333 | op->above = originator; |
1347 | op->above = originator; |
1334 | op->below = originator->below; |
1348 | op->below = originator->below; |
1335 | originator->below = op; |
1349 | originator->below = op; |
1336 | |
1350 | |
… | |
… | |
1422 | op->below = top; |
1436 | op->below = top; |
1423 | *(op->above ? &op->above->below : &ms.top) = op; |
1437 | *(op->above ? &op->above->below : &ms.top) = op; |
1424 | } |
1438 | } |
1425 | } |
1439 | } |
1426 | |
1440 | |
1427 | if (op->type == PLAYER) |
1441 | if (op->is_player ()) |
1428 | { |
1442 | { |
1429 | op->contr->do_los = 1; |
1443 | op->contr->do_los = 1; |
1430 | ++op->map->players; |
1444 | ++op->map->players; |
1431 | op->map->touch (); |
1445 | op->map->touch (); |
1432 | } |
1446 | } |
… | |
… | |
1447 | * be far away from this change and not affected in any way - |
1461 | * be far away from this change and not affected in any way - |
1448 | * this should get redone to only look for players within range, |
1462 | * this should get redone to only look for players within range, |
1449 | * or just updating the P_UPTODATE for spaces within this area |
1463 | * or just updating the P_UPTODATE for spaces within this area |
1450 | * of effect may be sufficient. |
1464 | * of effect may be sufficient. |
1451 | */ |
1465 | */ |
1452 | if (op->affects_los () && op->map->darkness) |
1466 | if (op->affects_los ()) |
1453 | { |
1467 | { |
1454 | op->ms ().invalidate (); |
1468 | op->ms ().invalidate (); |
1455 | update_all_los (op->map, op->x, op->y); |
1469 | update_all_los (op->map, op->x, op->y); |
1456 | } |
1470 | } |
1457 | |
1471 | |
… | |
… | |
1468 | * blocked() and wall() work properly), and these flags are updated by |
1482 | * blocked() and wall() work properly), and these flags are updated by |
1469 | * update_object(). |
1483 | * update_object(). |
1470 | */ |
1484 | */ |
1471 | |
1485 | |
1472 | /* if this is not the head or flag has been passed, don't check walk on status */ |
1486 | /* if this is not the head or flag has been passed, don't check walk on status */ |
1473 | if (!(flag & INS_NO_WALK_ON) && op->head_ () == op) |
1487 | if (!(flag & INS_NO_WALK_ON) && op->is_head ()) |
1474 | { |
1488 | { |
1475 | if (check_move_on (op, originator)) |
1489 | if (check_move_on (op, originator)) |
1476 | return 0; |
1490 | return 0; |
1477 | |
1491 | |
1478 | /* If we are a multi part object, lets work our way through the check |
1492 | /* If we are a multi part object, lets work our way through the check |
… | |
… | |
1489 | /* this function inserts an object in the map, but if it |
1503 | /* this function inserts an object in the map, but if it |
1490 | * finds an object of its own type, it'll remove that one first. |
1504 | * finds an object of its own type, it'll remove that one first. |
1491 | * op is the object to insert it under: supplies x and the map. |
1505 | * op is the object to insert it under: supplies x and the map. |
1492 | */ |
1506 | */ |
1493 | void |
1507 | void |
1494 | replace_insert_ob_in_map (const char *arch_string, object *op) |
1508 | replace_insert_ob_in_map (shstr_tmp archname, object *op) |
1495 | { |
1509 | { |
1496 | /* first search for itself and remove any old instances */ |
1510 | /* first search for itself and remove any old instances */ |
1497 | |
1511 | |
1498 | for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above) |
1512 | for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above) |
1499 | if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */ |
1513 | if (tmp->arch->archname == archname) /* same archetype */ |
1500 | tmp->destroy (); |
1514 | tmp->destroy (); |
1501 | |
1515 | |
1502 | object *tmp = arch_to_object (archetype::find (arch_string)); |
1516 | object *tmp = arch_to_object (archetype::find (archname)); |
1503 | |
1517 | |
1504 | tmp->x = op->x; |
1518 | tmp->x = op->x; |
1505 | tmp->y = op->y; |
1519 | tmp->y = op->y; |
1506 | |
1520 | |
1507 | insert_ob_in_map (tmp, op->map, op, 0); |
1521 | insert_ob_in_map (tmp, op->map, op, 0); |
… | |
… | |
1656 | |
1670 | |
1657 | adjust_weight (this, op->total_weight ()); |
1671 | adjust_weight (this, op->total_weight ()); |
1658 | |
1672 | |
1659 | inserted: |
1673 | inserted: |
1660 | /* reset the light list and los of the players on the map */ |
1674 | /* reset the light list and los of the players on the map */ |
1661 | if (op->glow_radius && is_on_map () && map->darkness) |
1675 | if (op->glow_radius && is_on_map ()) |
1662 | { |
1676 | { |
1663 | update_stats (); |
1677 | update_stats (); |
1664 | update_all_los (map, x, y); |
1678 | update_all_los (map, x, y); |
1665 | } |
1679 | } |
1666 | else if (type == PLAYER && !flag [FLAG_NO_FIX_PLAYER]) |
1680 | else if (is_player () && !flag [FLAG_NO_FIX_PLAYER]) |
1667 | // if this is a player's inventory, update stats |
1681 | // if this is a player's inventory, update stats |
1668 | update_stats (); |
1682 | update_stats (); |
1669 | |
1683 | |
1670 | INVOKE_OBJECT (INSERT, this); |
1684 | INVOKE_OBJECT (INSERT, this); |
1671 | |
1685 | |
… | |
… | |
1693 | * on top. |
1707 | * on top. |
1694 | */ |
1708 | */ |
1695 | int |
1709 | int |
1696 | check_move_on (object *op, object *originator) |
1710 | check_move_on (object *op, object *originator) |
1697 | { |
1711 | { |
|
|
1712 | if (QUERY_FLAG (op, FLAG_NO_APPLY)) |
|
|
1713 | return 0; |
|
|
1714 | |
1698 | object *tmp; |
1715 | object *tmp; |
1699 | maptile *m = op->map; |
1716 | maptile *m = op->map; |
1700 | int x = op->x, y = op->y; |
1717 | int x = op->x, y = op->y; |
1701 | |
1718 | |
1702 | MoveType move_on, move_slow, move_block; |
1719 | mapspace &ms = m->at (x, y); |
1703 | |
1720 | |
1704 | if (QUERY_FLAG (op, FLAG_NO_APPLY)) |
1721 | ms.update (); |
1705 | return 0; |
|
|
1706 | |
1722 | |
1707 | move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y); |
1723 | MoveType move_on = ms.move_on; |
1708 | move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y); |
1724 | MoveType move_slow = ms.move_slow; |
1709 | move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y); |
1725 | MoveType move_block = ms.move_block; |
1710 | |
1726 | |
1711 | /* if nothing on this space will slow op down or be applied, |
1727 | /* if nothing on this space will slow op down or be applied, |
1712 | * no need to do checking below. have to make sure move_type |
1728 | * no need to do checking below. have to make sure move_type |
1713 | * is set, as lots of objects don't have it set - we treat that |
1729 | * is set, as lots of objects don't have it set - we treat that |
1714 | * as walking. |
1730 | * as walking. |
… | |
… | |
1725 | return 0; |
1741 | return 0; |
1726 | |
1742 | |
1727 | /* The objects have to be checked from top to bottom. |
1743 | /* The objects have to be checked from top to bottom. |
1728 | * Hence, we first go to the top: |
1744 | * Hence, we first go to the top: |
1729 | */ |
1745 | */ |
1730 | |
1746 | for (object *next, *tmp = ms.top; tmp; tmp = next) |
1731 | for (tmp = op->ms ().bot; tmp && tmp->above; tmp = tmp->above) |
|
|
1732 | { |
|
|
1733 | /* Trim the search when we find the first other spell effect |
|
|
1734 | * this helps performance so that if a space has 50 spell objects, |
|
|
1735 | * we don't need to check all of them. |
|
|
1736 | */ |
|
|
1737 | if ((tmp->move_type & MOVE_FLY_LOW) && QUERY_FLAG (tmp, FLAG_NO_PICK)) |
|
|
1738 | break; |
|
|
1739 | } |
1747 | { |
|
|
1748 | next = tmp->below; |
1740 | |
1749 | |
1741 | for (; tmp; tmp = tmp->below) |
|
|
1742 | { |
|
|
1743 | if (tmp == op) |
1750 | if (tmp == op) |
1744 | continue; /* Can't apply yourself */ |
1751 | continue; /* Can't apply yourself */ |
1745 | |
1752 | |
1746 | /* Check to see if one of the movement types should be slowed down. |
1753 | /* Check to see if one of the movement types should be slowed down. |
1747 | * Second check makes sure that the movement types not being slowed |
1754 | * Second check makes sure that the movement types not being slowed |
… | |
… | |
1752 | if (!QUERY_FLAG (op, FLAG_WIZPASS)) |
1759 | if (!QUERY_FLAG (op, FLAG_WIZPASS)) |
1753 | { |
1760 | { |
1754 | if ((!op->move_type && tmp->move_slow & MOVE_WALK) || |
1761 | if ((!op->move_type && tmp->move_slow & MOVE_WALK) || |
1755 | ((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0)) |
1762 | ((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0)) |
1756 | { |
1763 | { |
1757 | |
|
|
1758 | float |
|
|
1759 | diff = tmp->move_slow_penalty * fabs (op->speed); |
1764 | float diff = tmp->move_slow_penalty * fabs (op->speed); |
1760 | |
1765 | |
1761 | if (op->type == PLAYER) |
1766 | if (op->is_player ()) |
1762 | if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) || |
1767 | if ((tmp->flag [FLAG_IS_HILLY ] && find_skill_by_number (op, SK_CLIMBING)) || |
1763 | (QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN))) |
1768 | (tmp->flag [FLAG_IS_WOODED] && find_skill_by_number (op, SK_WOODSMAN))) |
1764 | diff /= 4.0; |
1769 | diff /= 4.0; |
1765 | |
1770 | |
1766 | op->speed_left -= diff; |
1771 | op->speed_left -= diff; |
1767 | } |
1772 | } |
1768 | } |
1773 | } |
… | |
… | |
2052 | * there is capable of. |
2057 | * there is capable of. |
2053 | */ |
2058 | */ |
2054 | int |
2059 | int |
2055 | find_dir (maptile *m, int x, int y, object *exclude) |
2060 | find_dir (maptile *m, int x, int y, object *exclude) |
2056 | { |
2061 | { |
2057 | int i, max = SIZEOFFREE, mflags; |
2062 | int max = SIZEOFFREE, mflags; |
2058 | |
|
|
2059 | sint16 nx, ny; |
|
|
2060 | object *tmp; |
|
|
2061 | maptile *mp; |
|
|
2062 | |
|
|
2063 | MoveType blocked, move_type; |
2063 | MoveType move_type; |
2064 | |
2064 | |
2065 | if (exclude && exclude->head_ () != exclude) |
2065 | if (exclude && exclude->head_ () != exclude) |
2066 | { |
2066 | { |
2067 | exclude = exclude->head; |
2067 | exclude = exclude->head; |
2068 | move_type = exclude->move_type; |
2068 | move_type = exclude->move_type; |
… | |
… | |
2071 | { |
2071 | { |
2072 | /* If we don't have anything, presume it can use all movement types. */ |
2072 | /* If we don't have anything, presume it can use all movement types. */ |
2073 | move_type = MOVE_ALL; |
2073 | move_type = MOVE_ALL; |
2074 | } |
2074 | } |
2075 | |
2075 | |
2076 | for (i = 1; i < max; i++) |
2076 | for (int i = 1; i < max; i++) |
2077 | { |
2077 | { |
2078 | mp = m; |
2078 | mapxy pos (m, x, y); |
2079 | nx = x + freearr_x[i]; |
2079 | pos.move (i); |
2080 | ny = y + freearr_y[i]; |
|
|
2081 | |
2080 | |
2082 | mflags = get_map_flags (m, &mp, nx, ny, &nx, &ny); |
2081 | if (!pos.normalise ()) |
2083 | |
|
|
2084 | if (mflags & P_OUT_OF_MAP) |
|
|
2085 | max = maxfree[i]; |
2082 | max = maxfree[i]; |
2086 | else |
2083 | else |
2087 | { |
2084 | { |
2088 | mapspace &ms = mp->at (nx, ny); |
2085 | mapspace &ms = *pos; |
2089 | |
2086 | |
2090 | blocked = ms.move_block; |
|
|
2091 | |
|
|
2092 | if ((move_type & blocked) == move_type) |
2087 | if ((move_type & ms.move_block) == move_type) |
2093 | max = maxfree[i]; |
2088 | max = maxfree [i]; |
2094 | else if (mflags & P_IS_ALIVE) |
2089 | else if (ms.flags () & P_IS_ALIVE) |
2095 | { |
2090 | { |
2096 | for (tmp = ms.bot; tmp; tmp = tmp->above) |
2091 | for (object *tmp = ms.bot; tmp; tmp = tmp->above) |
2097 | if ((tmp->flag [FLAG_MONSTER] || tmp->type == PLAYER) |
2092 | if ((tmp->flag [FLAG_MONSTER] || tmp->is_player ()) |
2098 | && (tmp != exclude || (tmp->head_ () != tmp && tmp->head_ () != exclude))) |
2093 | && (tmp != exclude || (tmp->head_ () != tmp && tmp->head_ () != exclude))) |
2099 | break; |
|
|
2100 | |
|
|
2101 | if (tmp) |
|
|
2102 | return freedir[i]; |
2094 | return freedir [i]; |
2103 | } |
2095 | } |
2104 | } |
2096 | } |
2105 | } |
2097 | } |
2106 | |
2098 | |
2107 | return 0; |
2099 | return 0; |
… | |
… | |
2182 | * This basically means that if direction is 15, then it could either go |
2174 | * This basically means that if direction is 15, then it could either go |
2183 | * direction 4, 14, or 16 to get back to where we are. |
2175 | * direction 4, 14, or 16 to get back to where we are. |
2184 | * Moved from spell_util.c to object.c with the other related direction |
2176 | * Moved from spell_util.c to object.c with the other related direction |
2185 | * functions. |
2177 | * functions. |
2186 | */ |
2178 | */ |
2187 | int reduction_dir[SIZEOFFREE][3] = { |
2179 | static const int reduction_dir[SIZEOFFREE][3] = { |
2188 | {0, 0, 0}, /* 0 */ |
2180 | {0, 0, 0}, /* 0 */ |
2189 | {0, 0, 0}, /* 1 */ |
2181 | {0, 0, 0}, /* 1 */ |
2190 | {0, 0, 0}, /* 2 */ |
2182 | {0, 0, 0}, /* 2 */ |
2191 | {0, 0, 0}, /* 3 */ |
2183 | {0, 0, 0}, /* 3 */ |
2192 | {0, 0, 0}, /* 4 */ |
2184 | {0, 0, 0}, /* 4 */ |
… | |
… | |
2288 | int |
2280 | int |
2289 | can_pick (const object *who, const object *item) |
2281 | can_pick (const object *who, const object *item) |
2290 | { |
2282 | { |
2291 | return /*QUERY_FLAG(who,FLAG_WIZ)|| */ |
2283 | return /*QUERY_FLAG(who,FLAG_WIZ)|| */ |
2292 | (item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) && |
2284 | (item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) && |
2293 | !QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->type == PLAYER || item->weight < who->weight / 3)); |
2285 | !QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->is_player () || item->weight < who->weight / 3)); |
2294 | } |
2286 | } |
2295 | |
2287 | |
2296 | /* |
2288 | /* |
2297 | * create clone from object to another |
2289 | * create clone from object to another |
2298 | */ |
2290 | */ |
… | |
… | |
2330 | return tmp; |
2322 | return tmp; |
2331 | |
2323 | |
2332 | return 0; |
2324 | return 0; |
2333 | } |
2325 | } |
2334 | |
2326 | |
2335 | const shstr & |
2327 | shstr_tmp |
2336 | object::kv_get (const shstr &key) const |
2328 | object::kv_get (shstr_tmp key) const |
2337 | { |
2329 | { |
2338 | for (key_value *kv = key_values; kv; kv = kv->next) |
2330 | for (key_value *kv = key_values; kv; kv = kv->next) |
2339 | if (kv->key == key) |
2331 | if (kv->key == key) |
2340 | return kv->value; |
2332 | return kv->value; |
2341 | |
2333 | |
2342 | return shstr_null; |
2334 | return shstr (); |
2343 | } |
2335 | } |
2344 | |
2336 | |
2345 | void |
2337 | void |
2346 | object::kv_set (const shstr &key, const shstr &value) |
2338 | object::kv_set (shstr_tmp key, shstr_tmp value) |
2347 | { |
2339 | { |
2348 | for (key_value *kv = key_values; kv; kv = kv->next) |
2340 | for (key_value *kv = key_values; kv; kv = kv->next) |
2349 | if (kv->key == key) |
2341 | if (kv->key == key) |
2350 | { |
2342 | { |
2351 | kv->value = value; |
2343 | kv->value = value; |
… | |
… | |
2360 | |
2352 | |
2361 | key_values = kv; |
2353 | key_values = kv; |
2362 | } |
2354 | } |
2363 | |
2355 | |
2364 | void |
2356 | void |
2365 | object::kv_del (const shstr &key) |
2357 | object::kv_del (shstr_tmp key) |
2366 | { |
2358 | { |
2367 | for (key_value **kvp = &key_values; *kvp; kvp = &(*kvp)->next) |
2359 | for (key_value **kvp = &key_values; *kvp; kvp = &(*kvp)->next) |
2368 | if ((*kvp)->key == key) |
2360 | if ((*kvp)->key == key) |
2369 | { |
2361 | { |
2370 | key_value *kv = *kvp; |
2362 | key_value *kv = *kvp; |
… | |
… | |
2501 | container = 0; |
2493 | container = 0; |
2502 | |
2494 | |
2503 | // client needs item update to make it work, client bug requires this to be separate |
2495 | // client needs item update to make it work, client bug requires this to be separate |
2504 | esrv_update_item (UPD_FLAGS, this, old_container); |
2496 | esrv_update_item (UPD_FLAGS, this, old_container); |
2505 | |
2497 | |
2506 | new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container)); |
2498 | new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", old_container->query_name ()); |
2507 | play_sound (sound_find ("chest_close")); |
2499 | play_sound (sound_find ("chest_close")); |
2508 | } |
2500 | } |
2509 | |
2501 | |
2510 | if (new_container) |
2502 | if (new_container) |
2511 | { |
2503 | { |
… | |
… | |
2521 | closer->flag [FLAG_NO_MAP_SAVE] = 1; |
2513 | closer->flag [FLAG_NO_MAP_SAVE] = 1; |
2522 | new_container->insert (closer); |
2514 | new_container->insert (closer); |
2523 | } |
2515 | } |
2524 | #endif |
2516 | #endif |
2525 | |
2517 | |
2526 | new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container)); |
2518 | new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", new_container->query_name ()); |
2527 | |
2519 | |
2528 | // make sure the container is available, client bug requires this to be separate |
2520 | // make sure the container is available, client bug requires this to be separate |
2529 | esrv_send_item (this, new_container); |
2521 | esrv_send_item (this, new_container); |
2530 | |
2522 | |
2531 | new_container->flag [FLAG_APPLIED] = true; |
2523 | new_container->flag [FLAG_APPLIED] = true; |
… | |
… | |
2539 | // else if (!old_container->env && contr && contr->ns) |
2531 | // else if (!old_container->env && contr && contr->ns) |
2540 | // contr->ns->floorbox_reset (); |
2532 | // contr->ns->floorbox_reset (); |
2541 | } |
2533 | } |
2542 | |
2534 | |
2543 | object * |
2535 | object * |
2544 | object::force_find (const shstr name) |
2536 | object::force_find (shstr_tmp name) |
2545 | { |
2537 | { |
2546 | /* cycle through his inventory to look for the MARK we want to |
2538 | /* cycle through his inventory to look for the MARK we want to |
2547 | * place |
2539 | * place |
2548 | */ |
2540 | */ |
2549 | for (object *tmp = inv; tmp; tmp = tmp->below) |
2541 | for (object *tmp = inv; tmp; tmp = tmp->below) |
… | |
… | |
2551 | return splay (tmp); |
2543 | return splay (tmp); |
2552 | |
2544 | |
2553 | return 0; |
2545 | return 0; |
2554 | } |
2546 | } |
2555 | |
2547 | |
|
|
2548 | //-GPL |
|
|
2549 | |
|
|
2550 | void |
|
|
2551 | object::force_set_timer (int duration) |
|
|
2552 | { |
|
|
2553 | this->duration = 1; |
|
|
2554 | this->speed_left = -1.f; |
|
|
2555 | |
|
|
2556 | this->set_speed (duration ? 1.f / duration : 0.f); |
|
|
2557 | } |
|
|
2558 | |
2556 | object * |
2559 | object * |
2557 | object::force_add (const shstr name, int duration) |
2560 | object::force_add (shstr_tmp name, int duration) |
2558 | { |
2561 | { |
2559 | if (object *force = force_find (name)) |
2562 | if (object *force = force_find (name)) |
2560 | force->destroy (); |
2563 | force->destroy (); |
2561 | |
2564 | |
2562 | object *force = get_archetype (FORCE_NAME); |
2565 | object *force = get_archetype (FORCE_NAME); |
2563 | |
2566 | |
2564 | force->slaying = name; |
2567 | force->slaying = name; |
2565 | force->stats.food = 1; |
2568 | force->force_set_timer (duration); |
2566 | force->speed_left = -1.f; |
|
|
2567 | |
|
|
2568 | force->set_speed (duration ? 1.f / duration : 0.f); |
|
|
2569 | force->flag [FLAG_IS_USED_UP] = true; |
|
|
2570 | force->flag [FLAG_APPLIED] = true; |
2569 | force->flag [FLAG_APPLIED] = true; |
2571 | |
2570 | |
2572 | return insert (force); |
2571 | return insert (force); |
2573 | } |
2572 | } |
2574 | |
2573 | |
2575 | void |
2574 | void |
2576 | object::play_sound (faceidx sound) |
2575 | object::play_sound (faceidx sound) const |
2577 | { |
2576 | { |
2578 | if (!sound) |
2577 | if (!sound) |
2579 | return; |
2578 | return; |
2580 | |
2579 | |
2581 | if (flag [FLAG_REMOVED]) |
2580 | if (is_on_map ()) |
2582 | return; |
|
|
2583 | |
|
|
2584 | if (env) |
|
|
2585 | { |
|
|
2586 | if (object *pl = in_player ()) |
|
|
2587 | pl->contr->play_sound (sound); |
|
|
2588 | } |
|
|
2589 | else |
|
|
2590 | map->play_sound (sound, x, y); |
2581 | map->play_sound (sound, x, y); |
|
|
2582 | else if (object *pl = in_player ()) |
|
|
2583 | pl->contr->play_sound (sound); |
|
|
2584 | } |
|
|
2585 | |
|
|
2586 | void |
|
|
2587 | object::say_msg (const char *msg) const |
|
|
2588 | { |
|
|
2589 | if (is_on_map ()) |
|
|
2590 | map->say_msg (msg, x, y); |
|
|
2591 | else if (object *pl = in_player ()) |
|
|
2592 | pl->contr->play_sound (sound); |
2591 | } |
2593 | } |
2592 | |
2594 | |
2593 | void |
2595 | void |
2594 | object::make_noise () |
2596 | object::make_noise () |
2595 | { |
2597 | { |
2596 | // we do not model noise in the map, so instead put |
2598 | // we do not model noise in the map, so instead put |
2597 | // a temporary light into the noise source |
2599 | // a temporary light into the noise source |
2598 | // could use the map instead, but that's less reliable for our |
2600 | // could use the map instead, but that's less reliable for our |
2599 | // goal, which is to make invisibility a bit harder to exploit |
2601 | // goal, which is to make invisibility a bit harder to exploit |
2600 | |
2602 | |
|
|
2603 | // currently only works sensibly for players |
|
|
2604 | if (!is_player ()) |
|
|
2605 | return; |
|
|
2606 | |
2601 | // find old force, or create new one |
2607 | // find old force, or create new one |
2602 | object *force = force_find (shstr_noise_force); |
2608 | object *force = force_find (shstr_noise_force); |
2603 | |
2609 | |
2604 | if (force) |
2610 | if (force) |
2605 | force->speed = 1.f / 4; // patch old speed up |
2611 | force->speed_left = -1.f; // patch old speed up |
2606 | else |
2612 | else |
2607 | { |
2613 | { |
2608 | force = get_archetype (shstr_noise_force); |
2614 | force = archetype::get (shstr_noise_force); |
2609 | |
2615 | |
2610 | force->slaying = name; |
2616 | force->slaying = shstr_noise_force; |
2611 | force->stats.food = 1; |
2617 | force->stats.food = 1; |
2612 | force->speed_left = -1.f; |
2618 | force->speed_left = -1.f; |
2613 | |
2619 | |
2614 | force->set_speed (1.f / 4); |
2620 | force->set_speed (1.f / 4.f); |
2615 | force->flag [FLAG_IS_USED_UP] = true; |
2621 | force->flag [FLAG_IS_USED_UP] = true; |
2616 | force->flag [FLAG_APPLIED] = true; |
2622 | force->flag [FLAG_APPLIED] = true; |
2617 | |
2623 | |
2618 | insert (force); |
2624 | insert (force); |
2619 | } |
2625 | } |