E wb documentation + e_rd cleanup (#3125)

* e_rd cleanup

* first pass

* fix ?

* rename

* more rename

* fix other platform

* fix typo

* more documentation

* more work

* fix build

* fix

* more doc

* camera work

* more work

* cleanup

* more work

* clean up + fix build

* fix build

* more work

* change mSpeedRate name

* change description

* more work

* fire eff work

* fix build

* fix match

* debug fix ?

* update description

* rename field
This commit is contained in:
Luzagar
2026-03-11 11:12:17 +01:00
committed by GitHub
parent 2e75ea2444
commit 9b14f18755
10 changed files with 3844 additions and 3812 deletions
+1 -1
View File
@@ -480,7 +480,7 @@ int daAlink_c::setSyncBoarPos() {
int daAlink_c::setSyncBoarRunPos() {
e_wb_class* boar = (e_wb_class*)mRideAcKeep.getActor();
fopAc_ac_c* boar_actor = &boar->mEnemy;
fopAc_ac_c* boar_actor = &boar->enemy;
if (boar == NULL || boar->checkDownDamage()) {
boarForceGetOff();
+748 -725
View File
File diff suppressed because it is too large Load Diff
+3 -3
View File
@@ -531,7 +531,7 @@ static void e_rdb_end(e_rdb_class* i_this) {
anm_init(i_this, e_rdb_class::BCK_RB_ED_DEMO_DOWN, 2.0f, 0, 1.0f);
i_this->mMode = 1;
if (actor != NULL) {
actor->field_0x169e = 60;
actor->demo_mode = 60;
}
break;
@@ -580,12 +580,12 @@ static void e_rdb_end(e_rdb_class* i_this) {
break;
case 10:
if ((((actor->mActionID == 102 && actor->mEnemy.speedF > 40.0f) &&
if ((((actor->action == 102 && actor->enemy.speedF > 40.0f) &&
player->current.pos.x > 1470.0f && player->current.pos.x < 2130.0f)) &&
((player->current.pos.z < 200.0f) &&
(player->shape_angle.y > 0x7000 || player->shape_angle.y < -0x7000)))
{
actor->field_0x169e = 80;
actor->demo_mode = 80;
i_this->mMode = 11;
}
// [[fallthrough]]
+2928 -2921
View File
File diff suppressed because it is too large Load Diff
+1 -1
View File
@@ -918,7 +918,7 @@ BOOL daNpcTheB_c::doEvent() {
rv = TRUE;
} else {
wb_p = (e_wb_class*)fopAcM_SearchByName(fpcNm_E_WB_e);
if (wb_p->field_0x169e == 0x60 && wb_p->field_0x16a0 == 1) {
if (wb_p->demo_mode == 0x60 && wb_p->demo_timer == 1) {
mPersonalCombatAfterFlag = 1;
EvCut_PersonalCombatAfter();
rv = TRUE;
+2 -2
View File
@@ -172,10 +172,10 @@ static void* s_obj_sub(void* i_actor, void* i_data) {
void daObjCRVFENCE_c::NormalAction() {
if (!field_0x5f4) {
e_wb_class* wb_p = (e_wb_class*)fpcM_Search(s_obj_sub, this);
if (wb_p != NULL && wb_p->mActionID == ACT_PL_RIDE2) {
if (wb_p != NULL && wb_p->action == ACT_PL_RIDE2) {
fopAcM_OffStatus(this, fopAcStts_CULL_e);
fopAcM_seStartCurrent(this, Z2SE_OBJ_SAKU_BREAK, 0);
cXyz sp5c(fopAcM_GetPosition(&wb_p->mEnemy));
cXyz sp5c(fopAcM_GetPosition(&wb_p->enemy));
Mtx mtx;
mDoMtx_inverse(field_0x65c->getBaseTRMtx(), mtx);
mDoMtx_stack_c::copy(mtx);
+1 -1
View File
@@ -97,7 +97,7 @@ void daObjCRVLH_DW_c::Obj_Hit() {
if (mCyl.ChkCoHit() != 0) {
fopAc_ac_c* actor = mCyl.GetCoHitObj()->GetAc();
if (fopAcM_GetName(dCc_GetAc(actor)) == fpcNm_E_WB_e &&
((e_wb_class*)actor)->mActionID == ACT_PL_RIDE2)
((e_wb_class*)actor)->action == ACT_PL_RIDE2)
{
Break();
}
+20 -20
View File
@@ -5,48 +5,48 @@
#include "d/actor/d_a_tag_hstop.h"
BOOL e_wb_class::checkWait() {
return mActionMode == 0x2A;
return ride_mode == 0x2A;
}
void e_wb_class::setPlayerRideNow() {
mActionID = ACT_PL_RIDE_NOW;
mActionMode = 0;
mStatusFlags |= u16(3);
action = ACT_PL_RIDE_NOW;
ride_mode = 0;
status_flag |= u16(3);
}
void e_wb_class::setPlayerRide() {
mActionID = ACT_PL_RIDE;
mActionMode = 0;
mStatusFlags |= u16(3);
action = ACT_PL_RIDE;
ride_mode = 0;
status_flag |= u16(3);
mZ2Ride.setLinkRiding(true);
sound.setLinkRiding(true);
}
void e_wb_class::getOff() {
if (!checkDownDamage() || mActionID == ACT_PL_RIDE_NOW) {
mActionID = 0;
if (!checkDownDamage() || action == ACT_PL_RIDE_NOW) {
action = 0;
} else {
field_0x692 = 0;
old_action = 0;
}
mActionMode = 0;
mStatusFlags &= u16(~3);
mZ2Ride.setLinkRiding(false);
ride_mode = 0;
status_flag &= u16(~3);
sound.setLinkRiding(false);
}
BOOL e_wb_class::checkDownDamage() {
return mActionID != ACT_PL_RIDE && mActionID != 0x66 && mActionID != ACT_S_DAMAGE;
return action != ACT_PL_RIDE && action != ACT_PL_RIDE2 && action != ACT_S_DAMAGE;
}
BOOL e_wb_class::checkNormalRideMode() const {
return mActionID != 0x66 || mActionMode < 1;
return action != ACT_PL_RIDE2 || ride_mode < 1;
}
void e_wb_class::setRunRideMode() {
if (mActionID == ACT_PL_RIDE) {
mActionMode = 0;
mActionID = ACT_S_DAMAGE;
field_0x692 = 0x65;
if (action == ACT_PL_RIDE) {
ride_mode = 0;
action = ACT_S_DAMAGE;
old_action = ACT_PL_RIDE;
}
}