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 |
9 | * it under the terms of the GNU General Public License as published by |
9 | * it under the terms of the GNU General Public License as published by |
… | |
… | |
32 | #include <bitset> |
32 | #include <bitset> |
33 | |
33 | |
34 | UUID UUID::cur; |
34 | UUID UUID::cur; |
35 | static uint64_t seq_next_save; |
35 | static uint64_t seq_next_save; |
36 | static const uint64 UUID_GAP = 1<<19; |
36 | static const uint64 UUID_GAP = 1<<19; |
|
|
37 | uint32_t mapspace::smellcount = 10000; |
37 | |
38 | |
38 | objectvec objects; |
39 | objectvec objects; |
39 | activevec actives; |
40 | activevec actives; |
40 | |
41 | |
41 | short freearr_x[SIZEOFFREE] = { |
42 | short freearr_x[SIZEOFFREE] = { |
… | |
… | |
323 | { |
324 | { |
324 | // see if we are in a container of sorts |
325 | // see if we are in a container of sorts |
325 | if (env) |
326 | if (env) |
326 | { |
327 | { |
327 | // the player inventory itself is always visible |
328 | // the player inventory itself is always visible |
328 | if (env->type == PLAYER) |
329 | if (env->is_player ()) |
329 | return env; |
330 | return env; |
330 | |
331 | |
331 | // else a player could have our env open |
332 | // else a player could have our env open |
332 | object *envest = env->outer_env (); |
333 | object *envest = env->outer_env (); |
333 | |
334 | |
… | |
… | |
758 | else if (action == UP_OBJ_INSERT) |
759 | else if (action == UP_OBJ_INSERT) |
759 | { |
760 | { |
760 | // this is likely overkill, TODO: revisit (schmorp) |
761 | // this is likely overkill, TODO: revisit (schmorp) |
761 | if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW)) |
762 | if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW)) |
762 | || (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC)) |
763 | || (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC)) |
763 | || (op->type == PLAYER && !(m.flags_ & P_PLAYER)) |
764 | || (op->is_player () && !(m.flags_ & P_PLAYER)) |
764 | || (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE)) |
765 | || (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE)) |
765 | || (QUERY_FLAG (op, FLAG_ALIVE) && !(m.flags_ & P_IS_ALIVE)) |
766 | || (QUERY_FLAG (op, FLAG_ALIVE) && !(m.flags_ & P_IS_ALIVE)) |
766 | || (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC)) |
767 | || (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC)) |
767 | || (m.move_on | op->move_on ) != m.move_on |
768 | || (m.move_on | op->move_on ) != m.move_on |
768 | || (m.move_off | op->move_off ) != m.move_off |
769 | || (m.move_off | op->move_off ) != m.move_off |
… | |
… | |
770 | /* This isn't perfect, but I don't expect a lot of objects to |
771 | /* This isn't perfect, but I don't expect a lot of objects to |
771 | * have move_allow right now. |
772 | * have move_allow right now. |
772 | */ |
773 | */ |
773 | || ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block |
774 | || ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block |
774 | || 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp) |
775 | || 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp) |
775 | m.flags_ = 0; |
776 | m.invalidate (); |
776 | } |
777 | } |
777 | /* if the object is being removed, we can't make intelligent |
778 | /* if the object is being removed, we can't make intelligent |
778 | * decisions, because remove_ob can't really pass the object |
779 | * decisions, because remove_ob can't really pass the object |
779 | * that is being removed. |
780 | * that is being removed. |
780 | */ |
781 | */ |
781 | else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE) |
782 | else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE) |
782 | m.flags_ = 0; |
783 | m.invalidate (); |
783 | else if (action == UP_OBJ_FACE) |
784 | else if (action == UP_OBJ_FACE) |
784 | /* Nothing to do for that case */ ; |
785 | /* Nothing to do for that case */ ; |
785 | else |
786 | else |
786 | LOG (llevError, "update_object called with invalid action: %d\n", action); |
787 | LOG (llevError, "update_object called with invalid action: %d\n", action); |
787 | |
788 | |
… | |
… | |
830 | { |
831 | { |
831 | /* If already on active list, don't do anything */ |
832 | /* If already on active list, don't do anything */ |
832 | if (active) |
833 | if (active) |
833 | return; |
834 | return; |
834 | |
835 | |
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_FREED]) LOG (llevError | logBacktrace, "BUG: tried to activate freed object %s\n", debug_desc ());//D |
|
|
837 | if (has_active_speed () && flag [FLAG_DEBUG]) LOG (llevError | logBacktrace, "BUG: tried to activate DEBUG object %s\n", debug_desc ());//D temp |
836 | |
838 | |
837 | if (has_active_speed ()) |
839 | if (has_active_speed ()) |
838 | actives.insert (this); |
840 | actives.insert (this); |
839 | } |
841 | } |
840 | |
842 | |
… | |
… | |
908 | || map->in_memory != MAP_ACTIVE |
910 | || map->in_memory != MAP_ACTIVE |
909 | || map->no_drop |
911 | || map->no_drop |
910 | || ms ().move_block == MOVE_ALL) |
912 | || ms ().move_block == MOVE_ALL) |
911 | { |
913 | { |
912 | while (inv) |
914 | while (inv) |
913 | inv->destroy (true); |
915 | inv->destroy (); |
914 | } |
916 | } |
915 | else |
917 | else |
916 | { /* Put objects in inventory onto this space */ |
918 | { /* Put objects in inventory onto this space */ |
917 | while (inv) |
919 | while (inv) |
918 | { |
920 | { |
… | |
… | |
922 | || op->flag [FLAG_NO_DROP] |
924 | || op->flag [FLAG_NO_DROP] |
923 | || op->type == RUNE |
925 | || op->type == RUNE |
924 | || op->type == TRAP |
926 | || op->type == TRAP |
925 | || op->flag [FLAG_IS_A_TEMPLATE] |
927 | || op->flag [FLAG_IS_A_TEMPLATE] |
926 | || op->flag [FLAG_DESTROY_ON_DEATH]) |
928 | || op->flag [FLAG_DESTROY_ON_DEATH]) |
927 | op->destroy (true); |
929 | op->destroy (); |
928 | else |
930 | else |
929 | map->insert (op, x, y); |
931 | map->insert (op, x, y); |
930 | } |
932 | } |
931 | } |
933 | } |
932 | } |
934 | } |
… | |
… | |
961 | |
963 | |
962 | void |
964 | void |
963 | object::do_destroy () |
965 | object::do_destroy () |
964 | { |
966 | { |
965 | if (flag [FLAG_IS_LINKED]) |
967 | if (flag [FLAG_IS_LINKED]) |
966 | remove_button_link (this); |
968 | remove_link (); |
967 | |
969 | |
968 | if (flag [FLAG_FRIENDLY]) |
970 | if (flag [FLAG_FRIENDLY]) |
969 | remove_friendly_object (this); |
971 | remove_friendly_object (this); |
970 | |
972 | |
971 | remove (); |
973 | remove (); |
… | |
… | |
996 | attacked_by = 0; |
998 | attacked_by = 0; |
997 | current_weapon = 0; |
999 | current_weapon = 0; |
998 | } |
1000 | } |
999 | |
1001 | |
1000 | void |
1002 | void |
1001 | object::destroy (bool destroy_inventory) |
1003 | object::destroy () |
1002 | { |
1004 | { |
1003 | if (destroyed ()) |
1005 | if (destroyed ()) |
1004 | return; |
1006 | return; |
1005 | |
1007 | |
1006 | if (!is_head () && !head->destroyed ()) |
1008 | if (!is_head () && !head->destroyed ()) |
1007 | { |
1009 | { |
1008 | LOG (llevError | logBacktrace, "tried to destroy the tail of an object"); |
1010 | LOG (llevError | logBacktrace, "tried to destroy the tail of an object"); |
1009 | head->destroy (destroy_inventory); |
1011 | head->destroy (); |
1010 | return; |
1012 | return; |
1011 | } |
1013 | } |
1012 | |
1014 | |
1013 | destroy_inv (!destroy_inventory); |
1015 | destroy_inv (false); |
1014 | |
1016 | |
1015 | if (is_head ()) |
1017 | if (is_head ()) |
1016 | if (sound_destroy) |
1018 | if (sound_destroy) |
1017 | play_sound (sound_destroy); |
1019 | play_sound (sound_destroy); |
1018 | else if (flag [FLAG_MONSTER]) |
1020 | else if (flag [FLAG_MONSTER]) |
… | |
… | |
1054 | if (object *pl = visible_to ()) |
1056 | if (object *pl = visible_to ()) |
1055 | esrv_del_item (pl->contr, count); |
1057 | esrv_del_item (pl->contr, count); |
1056 | flag [FLAG_REMOVED] = true; // hack around the issue of visible_to checking flag_removed |
1058 | flag [FLAG_REMOVED] = true; // hack around the issue of visible_to checking flag_removed |
1057 | |
1059 | |
1058 | adjust_weight (env, -total_weight ()); |
1060 | adjust_weight (env, -total_weight ()); |
|
|
1061 | |
|
|
1062 | object *pl = in_player (); |
1059 | |
1063 | |
1060 | /* we set up values so that it could be inserted into |
1064 | /* we set up values so that it could be inserted into |
1061 | * the map, but we don't actually do that - it is up |
1065 | * the map, but we don't actually do that - it is up |
1062 | * to the caller to decide what we want to do. |
1066 | * to the caller to decide what we want to do. |
1063 | */ |
1067 | */ |
… | |
… | |
1075 | |
1079 | |
1076 | /* NO_FIX_PLAYER is set when a great many changes are being |
1080 | /* NO_FIX_PLAYER is set when a great many changes are being |
1077 | * made to players inventory. If set, avoiding the call |
1081 | * made to players inventory. If set, avoiding the call |
1078 | * to save cpu time. |
1082 | * to save cpu time. |
1079 | */ |
1083 | */ |
1080 | if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) |
1084 | if (pl) |
|
|
1085 | if (pl->is_player () && (glow_radius || !QUERY_FLAG (pl, FLAG_NO_FIX_PLAYER))) |
|
|
1086 | { |
1081 | otmp->update_stats (); |
1087 | pl->update_stats (); |
|
|
1088 | |
|
|
1089 | if (glow_radius && pl->is_on_map ()) |
|
|
1090 | update_all_los (pl->map, pl->x, pl->y); |
|
|
1091 | } |
1082 | } |
1092 | } |
1083 | else if (map) |
1093 | else if (map) |
1084 | { |
1094 | { |
1085 | map->dirty = true; |
1095 | map->dirty = true; |
1086 | mapspace &ms = this->ms (); |
1096 | mapspace &ms = this->ms (); |
1087 | |
1097 | |
1088 | if (object *pl = ms.player ()) |
1098 | if (object *pl = ms.player ()) |
1089 | { |
1099 | { |
1090 | if (type == PLAYER) // this == pl(!) |
1100 | if (is_player ()) |
1091 | { |
1101 | { |
|
|
1102 | if (!flag [FLAG_WIZPASS]) |
|
|
1103 | ms.smell = ++mapspace::smellcount; // remember the smell of the player |
|
|
1104 | |
1092 | // leaving a spot always closes any open container on the ground |
1105 | // leaving a spot always closes any open container on the ground |
1093 | if (container && !container->env) |
1106 | if (container && !container->env) |
1094 | // this causes spurious floorbox updates, but it ensures |
1107 | // this causes spurious floorbox updates, but it ensures |
1095 | // that the CLOSE event is being sent. |
1108 | // that the CLOSE event is being sent. |
1096 | close_container (); |
1109 | close_container (); |
… | |
… | |
1113 | *(below ? &below->above : &ms.bot) = above; |
1126 | *(below ? &below->above : &ms.bot) = above; |
1114 | |
1127 | |
1115 | above = 0; |
1128 | above = 0; |
1116 | below = 0; |
1129 | below = 0; |
1117 | |
1130 | |
1118 | ms.flags_ = 0; |
1131 | ms.invalidate (); |
1119 | |
1132 | |
1120 | if (map->in_memory == MAP_SAVING) |
1133 | if (map->in_memory == MAP_SAVING) |
1121 | return; |
1134 | return; |
1122 | |
1135 | |
1123 | int check_walk_off = !flag [FLAG_NO_APPLY]; |
1136 | int check_walk_off = !flag [FLAG_NO_APPLY]; |
… | |
… | |
1156 | } |
1169 | } |
1157 | |
1170 | |
1158 | last = tmp; |
1171 | last = tmp; |
1159 | } |
1172 | } |
1160 | |
1173 | |
1161 | if (flag [FLAG_BLOCKSVIEW] || glow_radius) |
1174 | if (affects_los ()) |
1162 | update_all_los (map, x, y); |
1175 | update_all_los (map, x, y); |
1163 | } |
1176 | } |
1164 | } |
1177 | } |
1165 | |
1178 | |
1166 | /* |
1179 | /* |
… | |
… | |
1190 | esrv_update_item (UPD_NROF, pl, top); |
1203 | esrv_update_item (UPD_NROF, pl, top); |
1191 | |
1204 | |
1192 | op->weight = 0; // cancel the addition above |
1205 | op->weight = 0; // cancel the addition above |
1193 | op->carrying = 0; // must be 0 already |
1206 | op->carrying = 0; // must be 0 already |
1194 | |
1207 | |
1195 | op->destroy (1); |
1208 | op->destroy (); |
1196 | |
1209 | |
1197 | return top; |
1210 | return top; |
1198 | } |
1211 | } |
1199 | |
1212 | |
1200 | return 0; |
1213 | return 0; |
… | |
… | |
1262 | * just 'op' otherwise |
1275 | * just 'op' otherwise |
1263 | */ |
1276 | */ |
1264 | object * |
1277 | object * |
1265 | insert_ob_in_map (object *op, maptile *m, object *originator, int flag) |
1278 | insert_ob_in_map (object *op, maptile *m, object *originator, int flag) |
1266 | { |
1279 | { |
1267 | if (op->is_on_map ()) |
|
|
1268 | { |
|
|
1269 | LOG (llevError, "insert_ob_in_map called for object already on map"); |
|
|
1270 | abort (); |
|
|
1271 | } |
|
|
1272 | |
|
|
1273 | if (op->env) |
|
|
1274 | { |
|
|
1275 | LOG (llevError, "insert_ob_in_map called for object in an inventory (proceeding)"); |
|
|
1276 | op->remove (); |
1280 | op->remove (); |
1277 | } |
|
|
1278 | |
1281 | |
1279 | if (op->face && !face_info (op->face))//D TODO: remove soon |
1282 | if (m == &freed_map)//D TODO: remove soon |
1280 | {//D |
1283 | {//D |
1281 | LOG (llevError | logBacktrace, "op->face out of bounds: %s", op->debug_desc ());//D |
1284 | LOG (llevError | logBacktrace, "tries to insret object on freed objects map: %s", op->debug_desc ());//D |
1282 | op->face = 1;//D |
|
|
1283 | }//D |
1285 | }//D |
1284 | |
1286 | |
1285 | /* Ideally, the caller figures this out. However, it complicates a lot |
1287 | /* Ideally, the caller figures this out. However, it complicates a lot |
1286 | * of areas of callers (eg, anything that uses find_free_spot would now |
1288 | * of areas of callers (eg, anything that uses find_free_spot would now |
1287 | * need extra work |
1289 | * need extra work |
1288 | */ |
1290 | */ |
|
|
1291 | maptile *newmap = m; |
1289 | if (!xy_normalise (m, op->x, op->y)) |
1292 | if (!xy_normalise (newmap, op->x, op->y)) |
1290 | { |
1293 | { |
1291 | op->head_ ()->destroy (1);// remove head_ once all tail object destroyers found |
1294 | op->head_ ()->destroy ();// remove head_ once all tail object destroyers found |
1292 | return 0; |
1295 | return 0; |
1293 | } |
1296 | } |
1294 | |
1297 | |
1295 | if (object *more = op->more) |
1298 | if (object *more = op->more) |
1296 | if (!insert_ob_in_map (more, m, originator, flag)) |
1299 | if (!insert_ob_in_map (more, m, originator, flag)) |
1297 | return 0; |
1300 | return 0; |
1298 | |
1301 | |
1299 | CLEAR_FLAG (op, FLAG_REMOVED); |
1302 | CLEAR_FLAG (op, FLAG_REMOVED); |
1300 | |
1303 | |
1301 | op->map = m; |
1304 | op->map = newmap; |
1302 | mapspace &ms = op->ms (); |
1305 | mapspace &ms = op->ms (); |
1303 | |
1306 | |
1304 | /* this has to be done after we translate the coordinates. |
1307 | /* this has to be done after we translate the coordinates. |
1305 | */ |
1308 | */ |
1306 | if (op->nrof && !(flag & INS_NO_MERGE)) |
1309 | if (op->nrof && !(flag & INS_NO_MERGE)) |
… | |
… | |
1309 | { |
1312 | { |
1310 | // TODO: we actually want to update tmp, not op, |
1313 | // TODO: we actually want to update tmp, not op, |
1311 | // but some caller surely breaks when we return tmp |
1314 | // but some caller surely breaks when we return tmp |
1312 | // from here :/ |
1315 | // from here :/ |
1313 | op->nrof += tmp->nrof; |
1316 | op->nrof += tmp->nrof; |
1314 | tmp->destroy (1); |
1317 | tmp->destroy (); |
1315 | } |
1318 | } |
1316 | |
1319 | |
1317 | CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */ |
1320 | CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */ |
1318 | CLEAR_FLAG (op, FLAG_INV_LOCKED); |
1321 | CLEAR_FLAG (op, FLAG_INV_LOCKED); |
1319 | |
1322 | |
… | |
… | |
1424 | op->below = top; |
1427 | op->below = top; |
1425 | *(op->above ? &op->above->below : &ms.top) = op; |
1428 | *(op->above ? &op->above->below : &ms.top) = op; |
1426 | } |
1429 | } |
1427 | } |
1430 | } |
1428 | |
1431 | |
1429 | if (op->type == PLAYER) |
1432 | if (op->is_player ()) |
1430 | { |
1433 | { |
1431 | op->contr->do_los = 1; |
1434 | op->contr->do_los = 1; |
1432 | ++op->map->players; |
1435 | ++op->map->players; |
1433 | op->map->touch (); |
1436 | op->map->touch (); |
1434 | } |
1437 | } |
… | |
… | |
1449 | * be far away from this change and not affected in any way - |
1452 | * be far away from this change and not affected in any way - |
1450 | * this should get redone to only look for players within range, |
1453 | * this should get redone to only look for players within range, |
1451 | * or just updating the P_UPTODATE for spaces within this area |
1454 | * or just updating the P_UPTODATE for spaces within this area |
1452 | * of effect may be sufficient. |
1455 | * of effect may be sufficient. |
1453 | */ |
1456 | */ |
1454 | if (op->map->darkness && (op->glow_radius != 0)) |
1457 | if (op->affects_los ()) |
|
|
1458 | { |
|
|
1459 | op->ms ().invalidate (); |
1455 | update_all_los (op->map, op->x, op->y); |
1460 | update_all_los (op->map, op->x, op->y); |
|
|
1461 | } |
1456 | |
1462 | |
1457 | /* updates flags (blocked, alive, no magic, etc) for this map space */ |
1463 | /* updates flags (blocked, alive, no magic, etc) for this map space */ |
1458 | update_object (op, UP_OBJ_INSERT); |
1464 | update_object (op, UP_OBJ_INSERT); |
1459 | |
1465 | |
1460 | INVOKE_OBJECT (INSERT, op); |
1466 | INVOKE_OBJECT (INSERT, op); |
… | |
… | |
1488 | /* this function inserts an object in the map, but if it |
1494 | /* this function inserts an object in the map, but if it |
1489 | * finds an object of its own type, it'll remove that one first. |
1495 | * finds an object of its own type, it'll remove that one first. |
1490 | * op is the object to insert it under: supplies x and the map. |
1496 | * op is the object to insert it under: supplies x and the map. |
1491 | */ |
1497 | */ |
1492 | void |
1498 | void |
1493 | replace_insert_ob_in_map (const char *arch_string, object *op) |
1499 | replace_insert_ob_in_map (shstr_tmp archname, object *op) |
1494 | { |
1500 | { |
1495 | /* first search for itself and remove any old instances */ |
1501 | /* first search for itself and remove any old instances */ |
1496 | |
1502 | |
1497 | for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above) |
1503 | for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above) |
1498 | if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */ |
1504 | if (tmp->arch->archname == archname) /* same archetype */ |
1499 | tmp->destroy (1); |
1505 | tmp->destroy (); |
1500 | |
1506 | |
1501 | object *tmp = arch_to_object (archetype::find (arch_string)); |
1507 | object *tmp = arch_to_object (archetype::find (archname)); |
1502 | |
1508 | |
1503 | tmp->x = op->x; |
1509 | tmp->x = op->x; |
1504 | tmp->y = op->y; |
1510 | tmp->y = op->y; |
1505 | |
1511 | |
1506 | insert_ob_in_map (tmp, op->map, op, 0); |
1512 | insert_ob_in_map (tmp, op->map, op, 0); |
… | |
… | |
1627 | if (object *pl = tmp->visible_to ()) |
1633 | if (object *pl = tmp->visible_to ()) |
1628 | esrv_update_item (UPD_NROF, pl, tmp); |
1634 | esrv_update_item (UPD_NROF, pl, tmp); |
1629 | |
1635 | |
1630 | adjust_weight (this, op->total_weight ()); |
1636 | adjust_weight (this, op->total_weight ()); |
1631 | |
1637 | |
1632 | op->destroy (1); |
1638 | op->destroy (); |
1633 | op = tmp; |
1639 | op = tmp; |
1634 | goto inserted; |
1640 | goto inserted; |
1635 | } |
1641 | } |
1636 | |
1642 | |
1637 | op->owner = 0; // it's his/hers now. period. |
1643 | op->owner = 0; // it's his/hers now. period. |
… | |
… | |
1655 | |
1661 | |
1656 | adjust_weight (this, op->total_weight ()); |
1662 | adjust_weight (this, op->total_weight ()); |
1657 | |
1663 | |
1658 | inserted: |
1664 | inserted: |
1659 | /* reset the light list and los of the players on the map */ |
1665 | /* reset the light list and los of the players on the map */ |
1660 | if (op->glow_radius && map && map->darkness) |
1666 | if (op->glow_radius && is_on_map ()) |
|
|
1667 | { |
|
|
1668 | update_stats (); |
1661 | update_all_los (map, x, y); |
1669 | update_all_los (map, x, y); |
1662 | |
1670 | } |
|
|
1671 | else if (is_player () && !flag [FLAG_NO_FIX_PLAYER]) |
1663 | // if this is a player's inventory, update stats |
1672 | // if this is a player's inventory, update stats |
1664 | if (type == PLAYER && !flag [FLAG_NO_FIX_PLAYER]) |
|
|
1665 | update_stats (); |
1673 | update_stats (); |
1666 | |
1674 | |
1667 | INVOKE_OBJECT (INSERT, this); |
1675 | INVOKE_OBJECT (INSERT, this); |
1668 | |
1676 | |
1669 | return op; |
1677 | return op; |
… | |
… | |
1753 | { |
1761 | { |
1754 | |
1762 | |
1755 | float |
1763 | float |
1756 | diff = tmp->move_slow_penalty * fabs (op->speed); |
1764 | diff = tmp->move_slow_penalty * fabs (op->speed); |
1757 | |
1765 | |
1758 | if (op->type == PLAYER) |
1766 | if (op->is_player ()) |
1759 | if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) || |
1767 | if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) || |
1760 | (QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN))) |
1768 | (QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN))) |
1761 | diff /= 4.0; |
1769 | diff /= 4.0; |
1762 | |
1770 | |
1763 | op->speed_left -= diff; |
1771 | op->speed_left -= diff; |
… | |
… | |
1971 | * head of the object should correspond for the entire object. |
1979 | * head of the object should correspond for the entire object. |
1972 | */ |
1980 | */ |
1973 | if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block)) |
1981 | if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block)) |
1974 | continue; |
1982 | continue; |
1975 | |
1983 | |
1976 | if (ob->blocked (m, pos.x, pos.y)) |
1984 | if (ob->blocked (pos.m, pos.x, pos.y)) |
1977 | continue; |
1985 | continue; |
1978 | |
1986 | |
1979 | altern [index++] = i; |
1987 | altern [index++] = i; |
1980 | } |
1988 | } |
1981 | |
1989 | |
… | |
… | |
2049 | * there is capable of. |
2057 | * there is capable of. |
2050 | */ |
2058 | */ |
2051 | int |
2059 | int |
2052 | find_dir (maptile *m, int x, int y, object *exclude) |
2060 | find_dir (maptile *m, int x, int y, object *exclude) |
2053 | { |
2061 | { |
2054 | int i, max = SIZEOFFREE, mflags; |
2062 | int max = SIZEOFFREE, mflags; |
2055 | |
|
|
2056 | sint16 nx, ny; |
|
|
2057 | object *tmp; |
|
|
2058 | maptile *mp; |
|
|
2059 | |
|
|
2060 | MoveType blocked, move_type; |
2063 | MoveType move_type; |
2061 | |
2064 | |
2062 | if (exclude && exclude->head_ () != exclude) |
2065 | if (exclude && exclude->head_ () != exclude) |
2063 | { |
2066 | { |
2064 | exclude = exclude->head; |
2067 | exclude = exclude->head; |
2065 | move_type = exclude->move_type; |
2068 | move_type = exclude->move_type; |
… | |
… | |
2068 | { |
2071 | { |
2069 | /* 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. */ |
2070 | move_type = MOVE_ALL; |
2073 | move_type = MOVE_ALL; |
2071 | } |
2074 | } |
2072 | |
2075 | |
2073 | for (i = 1; i < max; i++) |
2076 | for (int i = 1; i < max; i++) |
2074 | { |
2077 | { |
2075 | mp = m; |
2078 | mapxy pos (m, x, y); |
2076 | nx = x + freearr_x[i]; |
2079 | pos.move (i); |
2077 | ny = y + freearr_y[i]; |
|
|
2078 | |
2080 | |
2079 | mflags = get_map_flags (m, &mp, nx, ny, &nx, &ny); |
2081 | if (!pos.normalise ()) |
2080 | |
|
|
2081 | if (mflags & P_OUT_OF_MAP) |
|
|
2082 | max = maxfree[i]; |
2082 | max = maxfree[i]; |
2083 | else |
2083 | else |
2084 | { |
2084 | { |
2085 | mapspace &ms = mp->at (nx, ny); |
2085 | mapspace &ms = *pos; |
2086 | |
2086 | |
2087 | blocked = ms.move_block; |
|
|
2088 | |
|
|
2089 | if ((move_type & blocked) == move_type) |
2087 | if ((move_type & ms.move_block) == move_type) |
2090 | max = maxfree[i]; |
2088 | max = maxfree [i]; |
2091 | else if (mflags & P_IS_ALIVE) |
2089 | else if (ms.flags () & P_IS_ALIVE) |
2092 | { |
2090 | { |
2093 | for (tmp = ms.bot; tmp; tmp = tmp->above) |
2091 | for (object *tmp = ms.bot; tmp; tmp = tmp->above) |
2094 | if ((tmp->flag [FLAG_MONSTER] || tmp->type == PLAYER) |
2092 | if ((tmp->flag [FLAG_MONSTER] || tmp->is_player ()) |
2095 | && (tmp != exclude || (tmp->head_ () != tmp && tmp->head_ () != exclude))) |
2093 | && (tmp != exclude || (tmp->head_ () != tmp && tmp->head_ () != exclude))) |
2096 | break; |
|
|
2097 | |
|
|
2098 | if (tmp) |
|
|
2099 | return freedir[i]; |
2094 | return freedir [i]; |
2100 | } |
2095 | } |
2101 | } |
2096 | } |
2102 | } |
2097 | } |
2103 | |
2098 | |
2104 | return 0; |
2099 | return 0; |
… | |
… | |
2179 | * 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 |
2180 | * 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. |
2181 | * 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 |
2182 | * functions. |
2177 | * functions. |
2183 | */ |
2178 | */ |
2184 | int reduction_dir[SIZEOFFREE][3] = { |
2179 | const int reduction_dir[SIZEOFFREE][3] = { |
2185 | {0, 0, 0}, /* 0 */ |
2180 | {0, 0, 0}, /* 0 */ |
2186 | {0, 0, 0}, /* 1 */ |
2181 | {0, 0, 0}, /* 1 */ |
2187 | {0, 0, 0}, /* 2 */ |
2182 | {0, 0, 0}, /* 2 */ |
2188 | {0, 0, 0}, /* 3 */ |
2183 | {0, 0, 0}, /* 3 */ |
2189 | {0, 0, 0}, /* 4 */ |
2184 | {0, 0, 0}, /* 4 */ |
… | |
… | |
2285 | int |
2280 | int |
2286 | can_pick (const object *who, const object *item) |
2281 | can_pick (const object *who, const object *item) |
2287 | { |
2282 | { |
2288 | return /*QUERY_FLAG(who,FLAG_WIZ)|| */ |
2283 | return /*QUERY_FLAG(who,FLAG_WIZ)|| */ |
2289 | (item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) && |
2284 | (item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) && |
2290 | !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)); |
2291 | } |
2286 | } |
2292 | |
2287 | |
2293 | /* |
2288 | /* |
2294 | * create clone from object to another |
2289 | * create clone from object to another |
2295 | */ |
2290 | */ |
… | |
… | |
2327 | return tmp; |
2322 | return tmp; |
2328 | |
2323 | |
2329 | return 0; |
2324 | return 0; |
2330 | } |
2325 | } |
2331 | |
2326 | |
2332 | const shstr & |
2327 | shstr_tmp |
2333 | object::kv_get (const shstr &key) const |
2328 | object::kv_get (shstr_tmp key) const |
2334 | { |
2329 | { |
2335 | for (key_value *kv = key_values; kv; kv = kv->next) |
2330 | for (key_value *kv = key_values; kv; kv = kv->next) |
2336 | if (kv->key == key) |
2331 | if (kv->key == key) |
2337 | return kv->value; |
2332 | return kv->value; |
2338 | |
2333 | |
2339 | return shstr_null; |
2334 | return shstr (); |
2340 | } |
2335 | } |
2341 | |
2336 | |
2342 | void |
2337 | void |
2343 | object::kv_set (const shstr &key, const shstr &value) |
2338 | object::kv_set (shstr_tmp key, shstr_tmp value) |
2344 | { |
2339 | { |
2345 | for (key_value *kv = key_values; kv; kv = kv->next) |
2340 | for (key_value *kv = key_values; kv; kv = kv->next) |
2346 | if (kv->key == key) |
2341 | if (kv->key == key) |
2347 | { |
2342 | { |
2348 | kv->value = value; |
2343 | kv->value = value; |
… | |
… | |
2357 | |
2352 | |
2358 | key_values = kv; |
2353 | key_values = kv; |
2359 | } |
2354 | } |
2360 | |
2355 | |
2361 | void |
2356 | void |
2362 | object::kv_del (const shstr &key) |
2357 | object::kv_del (shstr_tmp key) |
2363 | { |
2358 | { |
2364 | for (key_value **kvp = &key_values; *kvp; kvp = &(*kvp)->next) |
2359 | for (key_value **kvp = &key_values; *kvp; kvp = &(*kvp)->next) |
2365 | if ((*kvp)->key == key) |
2360 | if ((*kvp)->key == key) |
2366 | { |
2361 | { |
2367 | key_value *kv = *kvp; |
2362 | key_value *kv = *kvp; |
… | |
… | |
2498 | container = 0; |
2493 | container = 0; |
2499 | |
2494 | |
2500 | // 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 |
2501 | esrv_update_item (UPD_FLAGS, this, old_container); |
2496 | esrv_update_item (UPD_FLAGS, this, old_container); |
2502 | |
2497 | |
2503 | 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 ()); |
2504 | play_sound (sound_find ("chest_close")); |
2499 | play_sound (sound_find ("chest_close")); |
2505 | } |
2500 | } |
2506 | |
2501 | |
2507 | if (new_container) |
2502 | if (new_container) |
2508 | { |
2503 | { |
… | |
… | |
2518 | closer->flag [FLAG_NO_MAP_SAVE] = 1; |
2513 | closer->flag [FLAG_NO_MAP_SAVE] = 1; |
2519 | new_container->insert (closer); |
2514 | new_container->insert (closer); |
2520 | } |
2515 | } |
2521 | #endif |
2516 | #endif |
2522 | |
2517 | |
2523 | 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 ()); |
2524 | |
2519 | |
2525 | // 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 |
2526 | esrv_send_item (this, new_container); |
2521 | esrv_send_item (this, new_container); |
2527 | |
2522 | |
2528 | new_container->flag [FLAG_APPLIED] = true; |
2523 | new_container->flag [FLAG_APPLIED] = true; |
… | |
… | |
2536 | // else if (!old_container->env && contr && contr->ns) |
2531 | // else if (!old_container->env && contr && contr->ns) |
2537 | // contr->ns->floorbox_reset (); |
2532 | // contr->ns->floorbox_reset (); |
2538 | } |
2533 | } |
2539 | |
2534 | |
2540 | object * |
2535 | object * |
2541 | object::force_find (const shstr name) |
2536 | object::force_find (shstr_tmp name) |
2542 | { |
2537 | { |
2543 | /* 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 |
2544 | * place |
2539 | * place |
2545 | */ |
2540 | */ |
2546 | for (object *tmp = inv; tmp; tmp = tmp->below) |
2541 | for (object *tmp = inv; tmp; tmp = tmp->below) |
… | |
… | |
2548 | return splay (tmp); |
2543 | return splay (tmp); |
2549 | |
2544 | |
2550 | return 0; |
2545 | return 0; |
2551 | } |
2546 | } |
2552 | |
2547 | |
2553 | void |
2548 | object * |
2554 | object::force_add (const shstr name, int duration) |
2549 | object::force_add (shstr_tmp name, int duration) |
2555 | { |
2550 | { |
2556 | if (object *force = force_find (name)) |
2551 | if (object *force = force_find (name)) |
2557 | force->destroy (); |
2552 | force->destroy (); |
2558 | |
2553 | |
2559 | object *force = get_archetype (FORCE_NAME); |
2554 | object *force = get_archetype (FORCE_NAME); |
… | |
… | |
2564 | |
2559 | |
2565 | force->set_speed (duration ? 1.f / duration : 0.f); |
2560 | force->set_speed (duration ? 1.f / duration : 0.f); |
2566 | force->flag [FLAG_IS_USED_UP] = true; |
2561 | force->flag [FLAG_IS_USED_UP] = true; |
2567 | force->flag [FLAG_APPLIED] = true; |
2562 | force->flag [FLAG_APPLIED] = true; |
2568 | |
2563 | |
2569 | insert (force); |
2564 | return insert (force); |
2570 | } |
2565 | } |
2571 | |
2566 | |
2572 | void |
2567 | void |
2573 | object::play_sound (faceidx sound) |
2568 | object::play_sound (faceidx sound) const |
2574 | { |
2569 | { |
2575 | if (!sound) |
2570 | if (!sound) |
2576 | return; |
2571 | return; |
2577 | |
2572 | |
2578 | if (flag [FLAG_REMOVED]) |
2573 | if (is_on_map ()) |
|
|
2574 | map->play_sound (sound, x, y); |
|
|
2575 | else if (object *pl = in_player ()) |
|
|
2576 | pl->contr->play_sound (sound); |
|
|
2577 | } |
|
|
2578 | |
|
|
2579 | void |
|
|
2580 | object::say_msg (const char *msg) const |
|
|
2581 | { |
|
|
2582 | if (is_on_map ()) |
|
|
2583 | map->say_msg (msg, x, y); |
|
|
2584 | else if (object *pl = in_player ()) |
|
|
2585 | pl->contr->play_sound (sound); |
|
|
2586 | } |
|
|
2587 | |
|
|
2588 | void |
|
|
2589 | object::make_noise () |
|
|
2590 | { |
|
|
2591 | // we do not model noise in the map, so instead put |
|
|
2592 | // a temporary light into the noise source |
|
|
2593 | // could use the map instead, but that's less reliable for our |
|
|
2594 | // goal, which is to make invisibility a bit harder to exploit |
|
|
2595 | |
|
|
2596 | // currently only works sensibly for players |
|
|
2597 | if (!is_player ()) |
2579 | return; |
2598 | return; |
2580 | |
2599 | |
2581 | if (env) |
2600 | // find old force, or create new one |
2582 | { |
2601 | object *force = force_find (shstr_noise_force); |
2583 | if (object *pl = in_player ()) |
2602 | |
2584 | pl->contr->play_sound (sound); |
2603 | if (force) |
2585 | } |
2604 | force->speed_left = -1.f; // patch old speed up |
2586 | else |
2605 | else |
2587 | map->play_sound (sound, x, y); |
2606 | { |
2588 | } |
2607 | force = archetype::get (shstr_noise_force); |
2589 | |
2608 | |
|
|
2609 | force->slaying = shstr_noise_force; |
|
|
2610 | force->stats.food = 1; |
|
|
2611 | force->speed_left = -1.f; |
|
|
2612 | |
|
|
2613 | force->set_speed (1.f / 4.f); |
|
|
2614 | force->flag [FLAG_IS_USED_UP] = true; |
|
|
2615 | force->flag [FLAG_APPLIED] = true; |
|
|
2616 | |
|
|
2617 | insert (force); |
|
|
2618 | } |
|
|
2619 | } |
|
|
2620 | |