falso
/
tp
mirror of https://github.com/zeldaret/tp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

dSv_info_c::isActor OK

This commit is contained in:
Pheenoh 2021-01-03 03:22:30 -05:00
parent 5c4ac052c3
commit 5abaebc40d
No known key found for this signature in database
GPG Key ID: 4312662758CE7D5A
2 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/d/d_save/d_save/d_save.h
View File

@ -804,6 +804,7 @@ public:
void init(int); void init(int);
dSv_zoneBit_c& getZoneBit() { return zone_bit; } dSv_zoneBit_c& getZoneBit() { return zone_bit; }
dSv_zoneActor_c& getZoneActor() { return zone_actor; } dSv_zoneActor_c& getZoneActor() { return zone_actor; }
const dSv_zoneActor_c& getZoneActorConst() const { return zone_actor; }
s8& getUnk0() { return unk0; } s8& getUnk0() { return unk0; }

10
src/d/d_save/d_save.cpp
View File

@ -1452,22 +1452,14 @@ void dSv_info_c::offActor(int i_id, int i_roomNo) {
this->zones[zoneNo].getZoneActor().off(i_id); this->zones[zoneNo].getZoneActor().off(i_id);
} }
// somewhat close
#ifdef NONMATCHING
BOOL dSv_info_c::isActor(int i_id, int i_roomNo) const { 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) { if (i_id == -1 || i_id == dSv_zoneActor_c::ACTOR_MAX || i_roomNo == -1) {
return FALSE; return FALSE;
} }
int ActorZoneNo = dStage_roomControl_c_NS_getZoneNo(i_roomNo, i_id); 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 #ifdef NONMATCHING
extern u8 lbl_803F6094[0x10100]; extern u8 lbl_803F6094[0x10100];