d_a_door_push OK (#1959)

* work on d_a_push_door

* d_a_door_push OK

* remove unused asm
This commit is contained in:
Trueffel
2023-10-10 22:43:24 +02:00
committed by GitHub
parent 3fa422caac
commit c5b54dd7ec
35 changed files with 408 additions and 1872 deletions
+4
View File
@@ -222,6 +222,7 @@ public:
FLG0_UNK_4000 = 0x4000,
FLG0_UNK_2000 = 0x2000,
FLG0_MAGNE_BOOTS_ON = 0x1000,
FLG0_PUSH_PULL_KEEP = 0x800,
FLG0_UNK_100 = 0x100,
FLG0_UNK_80 = 0x80,
FLG0_UNK_40 = 0x40,
@@ -764,6 +765,9 @@ public:
bool i_checkMidnaRide() const { return i_checkNoResetFlg0(FLG0_MIDNA_RIDE); }
void i_onPlayerNoDraw() { i_onNoResetFlg0(FLG0_PLAYER_NO_DRAW); }
void i_offPlayerNoDraw() { i_offNoResetFlg0(FLG0_PLAYER_NO_DRAW); }
void i_onPushPullKeep() { i_onNoResetFlg0(FLG0_PUSH_PULL_KEEP); }
void i_offPushPullKeep() { i_offNoResetFlg0(FLG0_PUSH_PULL_KEEP); }
u32 i_checkBoarSingleBattle() const { return i_checkNoResetFlg2(FLG2_BOAR_SINGLE_BATTLE); }
+4 -1
View File
@@ -17,7 +17,9 @@ class fopAc_ac_c;
class dBgW_Base : public cBgW_BgId {
public:
enum PushPullLabel {};
enum PushPullLabel {
PUSHPULL_LABEL1 = 1,
};
enum PRIORITY {
PRIORITY_0,
@@ -95,6 +97,7 @@ public:
bool chkStickWall() { return field_0xb & 1; }
bool chkStickRoof() { return field_0xb & 2; }
bool ChkPushPullOk() const { return m_pushPull_Ok; }
void SetPushPullCallback(PushPull_CallBack i_callBack) { m_pushPull_Callback = i_callBack; }
void SetRoomId(int id) { m_roomId = id; }
bool ChkPriority(int prio) { return m_priority == prio; }
void SetPriority(PRIORITY priority) { m_priority = priority; }
+4
View File
@@ -3082,6 +3082,10 @@ inline int dComIfGp_evmng_getMySubstanceNum(int index, char* name) {
return dComIfGp_getPEvtManager()->getMySubstanceNum(index, name);
}
inline void dComIfGp_evmng_setGoal(cXyz* i_goal) {
dComIfGp_getPEvtManager()->setGoal(i_goal);
}
inline BOOL dComIfGp_evmng_ChkPresentEnd() {
return dComIfGp_getPEvtManager()->ChkPresentEnd();
}