summaryrefslogtreecommitdiff
path: root/src/d/d_save/d_save.cpp
diff options
context:
space:
mode:
authorPheenoh <pheenoh@gmail.com>2021-01-03 03:22:30 -0500
committerPheenoh <pheenoh@gmail.com>2021-01-03 03:22:30 -0500
commit5abaebc40df02b65f791a16389a0c82590dbbda6 (patch)
tree4d96b9924a730ad37e6ac59a45a2caef6d76d019 /src/d/d_save/d_save.cpp
parent5c4ac052c3eadf70cfb4810341ccfbbba22869e2 (diff)
dSv_info_c::isActor OK
Diffstat (limited to 'src/d/d_save/d_save.cpp')
-rw-r--r--src/d/d_save/d_save.cpp10
1 files changed, 1 insertions, 9 deletions
diff --git a/src/d/d_save/d_save.cpp b/src/d/d_save/d_save.cpp
index 731b006853..26e94b2c82 100644
--- a/src/d/d_save/d_save.cpp
+++ b/src/d/d_save/d_save.cpp
@@ -1452,22 +1452,14 @@ void dSv_info_c::offActor(int i_id, int i_roomNo) {
this->zones[zoneNo].getZoneActor().off(i_id);
}
-// somewhat close
-#ifdef NONMATCHING
BOOL dSv_info_c::isActor(int i_id, int i_roomNo) const {
if (i_id == -1 || i_id == dSv_zoneActor_c::ACTOR_MAX || i_roomNo == -1) {
return FALSE;
}
int ActorZoneNo = dStage_roomControl_c_NS_getZoneNo(i_roomNo, i_id);
- return this->zones[ActorZoneNo].getZoneActor().is(i_id);
+ return this->zones[ActorZoneNo].getZoneActorConst().is(i_id);
}
-#else
-asm BOOL dSv_info_c::isActor(int i_id, int i_roomNo) const {
- nofralloc
-#include "d/d_save/d_save/asm/func_80035724.s"
-}
-#endif
#ifdef NONMATCHING
extern u8 lbl_803F6094[0x10100];