… | |
… | |
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 |
… | |
… | |
1079 | /* 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 |
1080 | * made to players inventory. If set, avoiding the call |
1081 | * made to players inventory. If set, avoiding the call |
1081 | * to save cpu time. |
1082 | * to save cpu time. |
1082 | */ |
1083 | */ |
1083 | if (pl) |
1084 | if (pl) |
1084 | if (pl->contr && !QUERY_FLAG (pl, FLAG_NO_FIX_PLAYER)) |
1085 | if (pl->is_player () && (glow_radius || !QUERY_FLAG (pl, FLAG_NO_FIX_PLAYER))) |
1085 | { |
1086 | { |
1086 | pl->update_stats (); |
1087 | pl->update_stats (); |
1087 | |
1088 | |
1088 | if (affects_los () && pl->is_on_map () && pl->map->darkness) |
1089 | if (glow_radius && pl->is_on_map ()) |
1089 | update_all_los (pl->map, pl->x, pl->y); |
1090 | update_all_los (pl->map, pl->x, pl->y); |
1090 | } |
1091 | } |
1091 | } |
1092 | } |
1092 | else if (map) |
1093 | else if (map) |
1093 | { |
1094 | { |
1094 | map->dirty = true; |
1095 | map->dirty = true; |
1095 | mapspace &ms = this->ms (); |
1096 | mapspace &ms = this->ms (); |
1096 | |
1097 | |
1097 | if (object *pl = ms.player ()) |
1098 | if (object *pl = ms.player ()) |
1098 | { |
1099 | { |
1099 | if (type == PLAYER) // this == pl(!) |
1100 | if (is_player ()) |
1100 | { |
1101 | { |
|
|
1102 | if (!flag [FLAG_WIZPASS]) |
|
|
1103 | ms.smell = ++mapspace::smellcount; // remember the smell of the player |
|
|
1104 | |
1101 | // leaving a spot always closes any open container on the ground |
1105 | // leaving a spot always closes any open container on the ground |
1102 | if (container && !container->env) |
1106 | if (container && !container->env) |
1103 | // this causes spurious floorbox updates, but it ensures |
1107 | // this causes spurious floorbox updates, but it ensures |
1104 | // that the CLOSE event is being sent. |
1108 | // that the CLOSE event is being sent. |
1105 | close_container (); |
1109 | close_container (); |
… | |
… | |
1165 | } |
1169 | } |
1166 | |
1170 | |
1167 | last = tmp; |
1171 | last = tmp; |
1168 | } |
1172 | } |
1169 | |
1173 | |
1170 | if (map->darkness && affects_los ()) |
1174 | if (affects_los ()) |
1171 | update_all_los (map, x, y); |
1175 | update_all_los (map, x, y); |
1172 | } |
1176 | } |
1173 | } |
1177 | } |
1174 | |
1178 | |
1175 | /* |
1179 | /* |
… | |
… | |
1422 | op->below = top; |
1426 | op->below = top; |
1423 | *(op->above ? &op->above->below : &ms.top) = op; |
1427 | *(op->above ? &op->above->below : &ms.top) = op; |
1424 | } |
1428 | } |
1425 | } |
1429 | } |
1426 | |
1430 | |
1427 | if (op->type == PLAYER) |
1431 | if (op->is_player ()) |
1428 | { |
1432 | { |
1429 | op->contr->do_los = 1; |
1433 | op->contr->do_los = 1; |
1430 | ++op->map->players; |
1434 | ++op->map->players; |
1431 | op->map->touch (); |
1435 | op->map->touch (); |
1432 | } |
1436 | } |
… | |
… | |
1447 | * be far away from this change and not affected in any way - |
1451 | * be far away from this change and not affected in any way - |
1448 | * this should get redone to only look for players within range, |
1452 | * this should get redone to only look for players within range, |
1449 | * or just updating the P_UPTODATE for spaces within this area |
1453 | * or just updating the P_UPTODATE for spaces within this area |
1450 | * of effect may be sufficient. |
1454 | * of effect may be sufficient. |
1451 | */ |
1455 | */ |
1452 | if (op->affects_los () && op->map->darkness) |
1456 | if (op->affects_los ()) |
1453 | { |
1457 | { |
1454 | op->ms ().invalidate (); |
1458 | op->ms ().invalidate (); |
1455 | update_all_los (op->map, op->x, op->y); |
1459 | update_all_los (op->map, op->x, op->y); |
1456 | } |
1460 | } |
1457 | |
1461 | |
… | |
… | |
1656 | |
1660 | |
1657 | adjust_weight (this, op->total_weight ()); |
1661 | adjust_weight (this, op->total_weight ()); |
1658 | |
1662 | |
1659 | inserted: |
1663 | inserted: |
1660 | /* reset the light list and los of the players on the map */ |
1664 | /* reset the light list and los of the players on the map */ |
1661 | if (op->glow_radius && is_on_map () && map->darkness) |
1665 | if (op->glow_radius && is_on_map ()) |
1662 | { |
1666 | { |
1663 | update_stats (); |
1667 | update_stats (); |
1664 | update_all_los (map, x, y); |
1668 | update_all_los (map, x, y); |
1665 | } |
1669 | } |
1666 | else if (type == PLAYER && !flag [FLAG_NO_FIX_PLAYER]) |
1670 | else if (is_player () && !flag [FLAG_NO_FIX_PLAYER]) |
1667 | // if this is a player's inventory, update stats |
1671 | // if this is a player's inventory, update stats |
1668 | update_stats (); |
1672 | update_stats (); |
1669 | |
1673 | |
1670 | INVOKE_OBJECT (INSERT, this); |
1674 | INVOKE_OBJECT (INSERT, this); |
1671 | |
1675 | |
… | |
… | |
1756 | { |
1760 | { |
1757 | |
1761 | |
1758 | float |
1762 | float |
1759 | diff = tmp->move_slow_penalty * fabs (op->speed); |
1763 | diff = tmp->move_slow_penalty * fabs (op->speed); |
1760 | |
1764 | |
1761 | if (op->type == PLAYER) |
1765 | if (op->is_player ()) |
1762 | if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) || |
1766 | if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) || |
1763 | (QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN))) |
1767 | (QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN))) |
1764 | diff /= 4.0; |
1768 | diff /= 4.0; |
1765 | |
1769 | |
1766 | op->speed_left -= diff; |
1770 | op->speed_left -= diff; |
… | |
… | |
2092 | if ((move_type & blocked) == move_type) |
2096 | if ((move_type & blocked) == move_type) |
2093 | max = maxfree[i]; |
2097 | max = maxfree[i]; |
2094 | else if (mflags & P_IS_ALIVE) |
2098 | else if (mflags & P_IS_ALIVE) |
2095 | { |
2099 | { |
2096 | for (tmp = ms.bot; tmp; tmp = tmp->above) |
2100 | for (tmp = ms.bot; tmp; tmp = tmp->above) |
2097 | if ((tmp->flag [FLAG_MONSTER] || tmp->type == PLAYER) |
2101 | if ((tmp->flag [FLAG_MONSTER] || tmp->is_player ()) |
2098 | && (tmp != exclude || (tmp->head_ () != tmp && tmp->head_ () != exclude))) |
2102 | && (tmp != exclude || (tmp->head_ () != tmp && tmp->head_ () != exclude))) |
2099 | break; |
2103 | break; |
2100 | |
2104 | |
2101 | if (tmp) |
2105 | if (tmp) |
2102 | return freedir[i]; |
2106 | return freedir[i]; |
… | |
… | |
2288 | int |
2292 | int |
2289 | can_pick (const object *who, const object *item) |
2293 | can_pick (const object *who, const object *item) |
2290 | { |
2294 | { |
2291 | return /*QUERY_FLAG(who,FLAG_WIZ)|| */ |
2295 | return /*QUERY_FLAG(who,FLAG_WIZ)|| */ |
2292 | (item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) && |
2296 | (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)); |
2297 | !QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->is_player () || item->weight < who->weight / 3)); |
2294 | } |
2298 | } |
2295 | |
2299 | |
2296 | /* |
2300 | /* |
2297 | * create clone from object to another |
2301 | * create clone from object to another |
2298 | */ |
2302 | */ |
… | |
… | |
2596 | // we do not model noise in the map, so instead put |
2600 | // we do not model noise in the map, so instead put |
2597 | // a temporary light into the noise source |
2601 | // a temporary light into the noise source |
2598 | // could use the map instead, but that's less reliable for our |
2602 | // could use the map instead, but that's less reliable for our |
2599 | // goal, which is to make invisibility a bit harder to exploit |
2603 | // goal, which is to make invisibility a bit harder to exploit |
2600 | |
2604 | |
|
|
2605 | // currently only works sensibly for players |
|
|
2606 | if (!is_player ()) |
|
|
2607 | return; |
|
|
2608 | |
2601 | // find old force, or create new one |
2609 | // find old force, or create new one |
2602 | object *force = force_find (shstr_noise_force); |
2610 | object *force = force_find (shstr_noise_force); |
2603 | |
2611 | |
2604 | if (force) |
2612 | if (force) |
2605 | force->speed = 1.f / 4; // patch old speed up |
2613 | force->speed_left = -1.f; // patch old speed up |
2606 | else |
2614 | else |
2607 | { |
2615 | { |
2608 | force = get_archetype (shstr_noise_force); |
2616 | force = archetype::get (shstr_noise_force); |
2609 | |
2617 | |
2610 | force->slaying = name; |
2618 | force->slaying = shstr_noise_force; |
2611 | force->stats.food = 1; |
2619 | force->stats.food = 1; |
2612 | force->speed_left = -1.f; |
2620 | force->speed_left = -1.f; |
2613 | |
2621 | |
2614 | force->set_speed (1.f / 4); |
2622 | force->set_speed (1.f / 4.f); |
2615 | force->flag [FLAG_IS_USED_UP] = true; |
2623 | force->flag [FLAG_IS_USED_UP] = true; |
2616 | force->flag [FLAG_APPLIED] = true; |
2624 | force->flag [FLAG_APPLIED] = true; |
2617 | |
2625 | |
2618 | insert (force); |
2626 | insert (force); |
2619 | } |
2627 | } |