diff --git a/include/d/d_save/d_save/d_save.h b/include/d/d_save/d_save/d_save.h index 595c33bcb80..f829b477b4c 100644 --- a/include/d/d_save/d_save/d_save.h +++ b/include/d/d_save/d_save/d_save.h @@ -804,6 +804,7 @@ public: void init(int); dSv_zoneBit_c& getZoneBit() { return zone_bit; } dSv_zoneActor_c& getZoneActor() { return zone_actor; } + const dSv_zoneActor_c& getZoneActorConst() const { return zone_actor; } s8& getUnk0() { return unk0; } diff --git a/src/d/d_save/d_save.cpp b/src/d/d_save/d_save.cpp index 731b006853f..26e94b2c826 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];