d_a_obj_beamos / d_a_e_wb WIP (#2620)

* WIP

* daE_WB_Draw

* checkpoint

* more matches

* checkpoint

* fixes

* fix debug build

* fix daObjBm_c alignment

* fixes for luz

* fixes for hatal

* manual spacing changes

* run clang-format

* move header back
This commit is contained in:
Howard Luck
2025-08-30 16:11:52 -06:00
committed by GitHub
parent 2036d9c34f
commit abf5f59f0c
28 changed files with 2912 additions and 4239 deletions
+6 -6
View File
@@ -10,18 +10,18 @@
#include "d/actor/d_a_tag_hstop.h"
BOOL e_wb_class::checkWait() {
return field_0x5b4 == 0x2A;
return mActionMode == 0x2A;
}
void e_wb_class::setPlayerRideNow() {
mActionID = ACT_PL_RIDE_NOW;
field_0x5b4 = 0;
mActionMode = 0;
field_0x6be |= 3;
}
void e_wb_class::setPlayerRide() {
mActionID = ACT_PL_RIDE;
field_0x5b4 = 0;
mActionMode = 0;
field_0x6be |= 3;
mZ2Ride.setLinkRiding(true);
@@ -34,7 +34,7 @@ void e_wb_class::getOff() {
field_0x692 = 0;
}
field_0x5b4 = 0;
mActionMode = 0;
field_0x6be &= ~3;
mZ2Ride.setLinkRiding(false);
}
@@ -44,12 +44,12 @@ BOOL e_wb_class::checkDownDamage() {
}
BOOL e_wb_class::checkNormalRideMode() const {
return mActionID != 0x66 || field_0x5b4 < 1;
return mActionID != 0x66 || mActionMode < 1;
}
void e_wb_class::setRunRideMode() {
if (mActionID == ACT_PL_RIDE) {
field_0x5b4 = 0;
mActionMode = 0;
mActionID = ACT_S_DAMAGE;
field_0x692 = 0x65;
}