Skip to content

Commit 94ac4ad

Browse files
committed
don't show things killed by player in lofs
1 parent e2d22f5 commit 94ac4ad

11 files changed

Lines changed: 174 additions & 162 deletions

src/level_alive_api.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -968,10 +968,10 @@
968968
return level_alive(g, v, l, is_unused22, p);
969969
}
970970

971-
[[nodiscard]] auto level_alive_is_unused23(Gamep g, Levelsp v, Levelp l, const bpoint &p) -> Thingp
971+
[[nodiscard]] auto level_alive_is_described_when_killed(Gamep g, Levelsp v, Levelp l, const bpoint &p) -> Thingp
972972
{
973973
TRACE_DEBUG();
974-
return level_alive(g, v, l, is_unused23, p);
974+
return level_alive(g, v, l, is_described_when_killed, p);
975975
}
976976

977977
[[nodiscard]] auto level_alive_is_chest(Gamep g, Levelsp v, Levelp l, const bpoint &p) -> Thingp

src/level_count_api.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -969,10 +969,10 @@
969969
return level_count(g, v, l, is_unused22, p);
970970
}
971971

972-
[[nodiscard]] auto level_count_is_unused23(Gamep g, Levelsp v, Levelp l, const bpoint &p) -> uint32_t
972+
[[nodiscard]] auto level_count_is_described_when_killed(Gamep g, Levelsp v, Levelp l, const bpoint &p) -> uint32_t
973973
{
974974
TRACE_DEBUG();
975-
return level_count(g, v, l, is_unused23, p);
975+
return level_count(g, v, l, is_described_when_killed, p);
976976
}
977977

978978
[[nodiscard]] auto level_count_is_chest(Gamep g, Levelsp v, Levelp l, const bpoint &p) -> uint32_t

src/level_flag_api.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -968,10 +968,10 @@
968968
return level_flag(g, v, l, is_unused22, p, me);
969969
}
970970

971-
[[nodiscard]] auto level_is_unused23(Gamep g, Levelsp v, Levelp l, const bpoint &p, Thingp me) -> Thingp
971+
[[nodiscard]] auto level_is_described_when_killed(Gamep g, Levelsp v, Levelp l, const bpoint &p, Thingp me) -> Thingp
972972
{
973973
TRACE_DEBUG();
974-
return level_flag(g, v, l, is_unused23, p, me);
974+
return level_flag(g, v, l, is_described_when_killed, p, me);
975975
}
976976

977977
[[nodiscard]] auto level_is_chest(Gamep g, Levelsp v, Levelp l, const bpoint &p, Thingp me) -> Thingp

src/level_flag_api_cached.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -968,10 +968,10 @@
968968
return level_flag_cached(g, v, l, is_unused22, p);
969969
}
970970

971-
[[nodiscard]] auto level_is_unused23_cached(Gamep g, Levelsp v, Levelp l, const bpoint &p) -> bool
971+
[[nodiscard]] auto level_is_described_when_killed_cached(Gamep g, Levelsp v, Levelp l, const bpoint &p) -> bool
972972
{
973973
TRACE_DEBUG();
974-
return level_flag_cached(g, v, l, is_unused23, p);
974+
return level_flag_cached(g, v, l, is_described_when_killed, p);
975975
}
976976

977977
[[nodiscard]] auto level_is_chest_cached(Gamep g, Levelsp v, Levelp l, const bpoint &p) -> bool

src/level_open_api.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -968,10 +968,10 @@
968968
return level_open(g, v, l, is_unused22, p);
969969
}
970970

971-
[[nodiscard]] auto level_open_is_unused23(Gamep g, Levelsp v, Levelp l, const bpoint &p) -> Thingp
971+
[[nodiscard]] auto level_open_is_described_when_killed(Gamep g, Levelsp v, Levelp l, const bpoint &p) -> Thingp
972972
{
973973
TRACE_DEBUG();
974-
return level_open(g, v, l, is_unused23, p);
974+
return level_open(g, v, l, is_described_when_killed, p);
975975
}
976976

977977
[[nodiscard]] auto level_open_is_chest(Gamep g, Levelsp v, Levelp l, const bpoint &p) -> Thingp

src/my_level.hpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -953,6 +953,7 @@ void level_fov(const FovContext & /*ctx*/);
953953
[[nodiscard]] auto level_is_dead_when_discharged(Gamep g, Levelsp v, Levelp l, const bpoint &p, Thingp me = nullptr) -> Thingp;
954954
[[nodiscard]] auto level_is_deep_water(Gamep g, Levelsp v, Levelp l, const bpoint &p, Thingp me = nullptr) -> Thingp;
955955
[[nodiscard]] auto level_is_described_cursor(Gamep g, Levelsp v, Levelp l, const bpoint &p, Thingp me = nullptr) -> Thingp;
956+
[[nodiscard]] auto level_is_described_when_killed(Gamep g, Levelsp v, Levelp l, const bpoint &p, Thingp me = nullptr) -> Thingp;
956957
[[nodiscard]] auto level_is_dirt(Gamep g, Levelsp v, Levelp l, const bpoint &p, Thingp me = nullptr) -> Thingp;
957958
[[nodiscard]] auto level_is_dmap(Gamep g, Levelsp v, Levelp l, const bpoint &p, Thingp me = nullptr) -> Thingp;
958959
[[nodiscard]] auto level_is_door_locked(Gamep g, Levelsp v, Levelp l, const bpoint &p, Thingp me = nullptr) -> Thingp;
@@ -1073,7 +1074,6 @@ void level_fov(const FovContext & /*ctx*/);
10731074
[[nodiscard]] auto level_is_unused20(Gamep g, Levelsp v, Levelp l, const bpoint &p, Thingp me = nullptr) -> Thingp;
10741075
[[nodiscard]] auto level_is_unused21(Gamep g, Levelsp v, Levelp l, const bpoint &p, Thingp me = nullptr) -> Thingp;
10751076
[[nodiscard]] auto level_is_unused22(Gamep g, Levelsp v, Levelp l, const bpoint &p, Thingp me = nullptr) -> Thingp;
1076-
[[nodiscard]] auto level_is_unused23(Gamep g, Levelsp v, Levelp l, const bpoint &p, Thingp me = nullptr) -> Thingp;
10771077
[[nodiscard]] auto level_is_unused3(Gamep g, Levelsp v, Levelp l, const bpoint &p, Thingp me = nullptr) -> Thingp;
10781078
[[nodiscard]] auto level_is_unused4(Gamep g, Levelsp v, Levelp l, const bpoint &p, Thingp me = nullptr) -> Thingp;
10791079
[[nodiscard]] auto level_is_unused46(Gamep g, Levelsp v, Levelp l, const bpoint &p, Thingp me = nullptr) -> Thingp;
@@ -1174,6 +1174,7 @@ void level_fov(const FovContext & /*ctx*/);
11741174
[[nodiscard]] auto level_is_dead_when_discharged_cached(Gamep g, Levelsp v, Levelp l, const bpoint &p) -> bool;
11751175
[[nodiscard]] auto level_is_deep_water_cached(Gamep g, Levelsp v, Levelp l, const bpoint &p) -> bool;
11761176
[[nodiscard]] auto level_is_described_cursor_cached(Gamep g, Levelsp v, Levelp l, const bpoint &p) -> bool;
1177+
[[nodiscard]] auto level_is_described_when_killed_cached(Gamep g, Levelsp v, Levelp l, const bpoint &p) -> bool;
11771178
[[nodiscard]] auto level_is_dirt_cached(Gamep g, Levelsp v, Levelp l, const bpoint &p) -> bool;
11781179
[[nodiscard]] auto level_is_dmap_cached(Gamep g, Levelsp v, Levelp l, const bpoint &p) -> bool;
11791180
[[nodiscard]] auto level_is_door_locked_cached(Gamep g, Levelsp v, Levelp l, const bpoint &p) -> bool;
@@ -1294,7 +1295,6 @@ void level_fov(const FovContext & /*ctx*/);
12941295
[[nodiscard]] auto level_is_unused20_cached(Gamep g, Levelsp v, Levelp l, const bpoint &p) -> bool;
12951296
[[nodiscard]] auto level_is_unused21_cached(Gamep g, Levelsp v, Levelp l, const bpoint &p) -> bool;
12961297
[[nodiscard]] auto level_is_unused22_cached(Gamep g, Levelsp v, Levelp l, const bpoint &p) -> bool;
1297-
[[nodiscard]] auto level_is_unused23_cached(Gamep g, Levelsp v, Levelp l, const bpoint &p) -> bool;
12981298
[[nodiscard]] auto level_is_unused3_cached(Gamep g, Levelsp v, Levelp l, const bpoint &p) -> bool;
12991299
[[nodiscard]] auto level_is_unused4_cached(Gamep g, Levelsp v, Levelp l, const bpoint &p) -> bool;
13001300
[[nodiscard]] auto level_is_unused46_cached(Gamep g, Levelsp v, Levelp l, const bpoint &p) -> bool;
@@ -1393,6 +1393,7 @@ void level_fov(const FovContext & /*ctx*/);
13931393
[[nodiscard]] auto level_alive_is_dead_when_discharged(Gamep g, Levelsp v, Levelp l, const bpoint &p) -> Thingp;
13941394
[[nodiscard]] auto level_alive_is_deep_water(Gamep g, Levelsp v, Levelp l, const bpoint &p) -> Thingp;
13951395
[[nodiscard]] auto level_alive_is_described_cursor(Gamep g, Levelsp v, Levelp l, const bpoint &p) -> Thingp;
1396+
[[nodiscard]] auto level_alive_is_described_when_killed(Gamep g, Levelsp v, Levelp l, const bpoint &p) -> Thingp;
13961397
[[nodiscard]] auto level_alive_is_dirt(Gamep g, Levelsp v, Levelp l, const bpoint &p) -> Thingp;
13971398
[[nodiscard]] auto level_alive_is_dmap(Gamep g, Levelsp v, Levelp l, const bpoint &p) -> Thingp;
13981399
[[nodiscard]] auto level_alive_is_door_locked(Gamep g, Levelsp v, Levelp l, const bpoint &p) -> Thingp;
@@ -1513,7 +1514,6 @@ void level_fov(const FovContext & /*ctx*/);
15131514
[[nodiscard]] auto level_alive_is_unused20(Gamep g, Levelsp v, Levelp l, const bpoint &p) -> Thingp;
15141515
[[nodiscard]] auto level_alive_is_unused21(Gamep g, Levelsp v, Levelp l, const bpoint &p) -> Thingp;
15151516
[[nodiscard]] auto level_alive_is_unused22(Gamep g, Levelsp v, Levelp l, const bpoint &p) -> Thingp;
1516-
[[nodiscard]] auto level_alive_is_unused23(Gamep g, Levelsp v, Levelp l, const bpoint &p) -> Thingp;
15171517
[[nodiscard]] auto level_alive_is_unused3(Gamep g, Levelsp v, Levelp l, const bpoint &p) -> Thingp;
15181518
[[nodiscard]] auto level_alive_is_unused4(Gamep g, Levelsp v, Levelp l, const bpoint &p) -> Thingp;
15191519
[[nodiscard]] auto level_alive_is_unused46(Gamep g, Levelsp v, Levelp l, const bpoint &p) -> Thingp;
@@ -1612,6 +1612,7 @@ void level_fov(const FovContext & /*ctx*/);
16121612
[[nodiscard]] auto level_count_is_dead_when_discharged(Gamep g, Levelsp v, Levelp l, const bpoint &p) -> uint32_t;
16131613
[[nodiscard]] auto level_count_is_deep_water(Gamep g, Levelsp v, Levelp l, const bpoint &p) -> uint32_t;
16141614
[[nodiscard]] auto level_count_is_described_cursor(Gamep g, Levelsp v, Levelp l, const bpoint &p) -> uint32_t;
1615+
[[nodiscard]] auto level_count_is_described_when_killed(Gamep g, Levelsp v, Levelp l, const bpoint &p) -> uint32_t;
16151616
[[nodiscard]] auto level_count_is_dirt(Gamep g, Levelsp v, Levelp l, const bpoint &p) -> uint32_t;
16161617
[[nodiscard]] auto level_count_is_dmap(Gamep g, Levelsp v, Levelp l, const bpoint &p) -> uint32_t;
16171618
[[nodiscard]] auto level_count_is_door_locked(Gamep g, Levelsp v, Levelp l, const bpoint &p) -> uint32_t;
@@ -1732,7 +1733,6 @@ void level_fov(const FovContext & /*ctx*/);
17321733
[[nodiscard]] auto level_count_is_unused20(Gamep g, Levelsp v, Levelp l, const bpoint &p) -> uint32_t;
17331734
[[nodiscard]] auto level_count_is_unused21(Gamep g, Levelsp v, Levelp l, const bpoint &p) -> uint32_t;
17341735
[[nodiscard]] auto level_count_is_unused22(Gamep g, Levelsp v, Levelp l, const bpoint &p) -> uint32_t;
1735-
[[nodiscard]] auto level_count_is_unused23(Gamep g, Levelsp v, Levelp l, const bpoint &p) -> uint32_t;
17361736
[[nodiscard]] auto level_count_is_unused3(Gamep g, Levelsp v, Levelp l, const bpoint &p) -> uint32_t;
17371737
[[nodiscard]] auto level_count_is_unused4(Gamep g, Levelsp v, Levelp l, const bpoint &p) -> uint32_t;
17381738
[[nodiscard]] auto level_count_is_unused46(Gamep g, Levelsp v, Levelp l, const bpoint &p) -> uint32_t;
@@ -1838,6 +1838,7 @@ void level_fov(const FovContext & /*ctx*/);
18381838
[[nodiscard]] auto level_open_is_dead_when_discharged(Gamep g, Levelsp v, Levelp l, const bpoint &p) -> Thingp;
18391839
[[nodiscard]] auto level_open_is_deep_water(Gamep g, Levelsp v, Levelp l, const bpoint &p) -> Thingp;
18401840
[[nodiscard]] auto level_open_is_described_cursor(Gamep g, Levelsp v, Levelp l, const bpoint &p) -> Thingp;
1841+
[[nodiscard]] auto level_open_is_described_when_killed(Gamep g, Levelsp v, Levelp l, const bpoint &p) -> Thingp;
18411842
[[nodiscard]] auto level_open_is_dirt(Gamep g, Levelsp v, Levelp l, const bpoint &p) -> Thingp;
18421843
[[nodiscard]] auto level_open_is_dmap(Gamep g, Levelsp v, Levelp l, const bpoint &p) -> Thingp;
18431844
[[nodiscard]] auto level_open_is_door_locked(Gamep g, Levelsp v, Levelp l, const bpoint &p) -> Thingp;
@@ -1958,7 +1959,6 @@ void level_fov(const FovContext & /*ctx*/);
19581959
[[nodiscard]] auto level_open_is_unused20(Gamep g, Levelsp v, Levelp l, const bpoint &p) -> Thingp;
19591960
[[nodiscard]] auto level_open_is_unused21(Gamep g, Levelsp v, Levelp l, const bpoint &p) -> Thingp;
19601961
[[nodiscard]] auto level_open_is_unused22(Gamep g, Levelsp v, Levelp l, const bpoint &p) -> Thingp;
1961-
[[nodiscard]] auto level_open_is_unused23(Gamep g, Levelsp v, Levelp l, const bpoint &p) -> Thingp;
19621962
[[nodiscard]] auto level_open_is_unused3(Gamep g, Levelsp v, Levelp l, const bpoint &p) -> Thingp;
19631963
[[nodiscard]] auto level_open_is_unused4(Gamep g, Levelsp v, Levelp l, const bpoint &p) -> Thingp;
19641964
[[nodiscard]] auto level_open_is_unused46(Gamep g, Levelsp v, Levelp l, const bpoint &p) -> Thingp;

src/my_thing.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -720,6 +720,7 @@ using Thing = struct Thing {
720720
[[nodiscard]] auto thing_is_dead_when_discharged(Thingp t) -> bool;
721721
[[nodiscard]] auto thing_is_deep_water(Thingp t) -> bool;
722722
[[nodiscard]] auto thing_is_described_cursor(Thingp t) -> bool;
723+
[[nodiscard]] auto thing_is_described_when_killed(Thingp t) -> bool;
723724
[[nodiscard]] auto thing_is_dir_bl(Thingp me) -> bool;
724725
[[nodiscard]] auto thing_is_dir_br(Thingp me) -> bool;
725726
[[nodiscard]] auto thing_is_dir_down(Thingp me) -> bool;
@@ -855,7 +856,6 @@ using Thing = struct Thing {
855856
[[nodiscard]] auto thing_is_unused20(Thingp t) -> bool;
856857
[[nodiscard]] auto thing_is_unused21(Thingp t) -> bool;
857858
[[nodiscard]] auto thing_is_unused22(Thingp t) -> bool;
858-
[[nodiscard]] auto thing_is_unused23(Thingp t) -> bool;
859859
[[nodiscard]] auto thing_is_unused3(Thingp t) -> bool;
860860
[[nodiscard]] auto thing_is_unused4(Thingp t) -> bool;
861861
[[nodiscard]] auto thing_is_unused46(Thingp t) -> bool;

0 commit comments

Comments
 (0)