mirror/tww
1
0
Fork 0
mirror of https://github.com/zeldaret/tww.git synced 2026-08-10 03:05:19 -04:00
Code Issues Packages Projects Releases Wiki Activity

d_a_ship documentation and inlines, couple more matches for player_ship

Browse Source
This commit is contained in:
LagoLunatic
2025-04-17 19:06:06 -04:00
parent 41ee5b8995
commit f74a03109f
6 changed files with 534 additions and 496 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/d/actor/d_a_ship.h
+68 -50
View File
@@ -17,21 +17,21 @@ class daBomb_c;
class daShip_c : public fopAc_ac_c {
public:
enum daSHIP_SFLG {
daSFLG_UNK1_e = 0x00000001,
daSFLG_FLY_e = 0x00000001,
daSFLG_UNK2_e = 0x00000002,
daSFLG_UNK4_e = 0x00000004,
daSFLG_UNK8_e = 0x00000008,
daSFLG_UNK10_e = 0x00000010,
daSFLG_UNK20_e = 0x00000020,
daSFLG_UNK40_e = 0x00000040,
daSFLG_UNK80_e = 0x00000080,
daSFLG_JUMP_e = 0x00000040,
daSFLG_LAND_e = 0x00000080,
daSFLG_UNK100_e = 0x00000100,
daSFLG_UNK200_e = 0x00000200,
daSFLG_SAIL_ON_e = 0x00000200,
daSFLG_UNK400_e = 0x00000400,
daSFLG_UNK800_e = 0x00000800,
daSFLG_UNK1000_e = 0x00001000,
daSFLG_UNK2000_e = 0x00002000,
daSFLG_UNK4000_e = 0x00004000,
daSFLG_JUMP_RIDE_e = 0x00002000,
daSFLG_JUMP_OK_e = 0x00004000,
daSFLG_UNK8000_e = 0x00008000,
daSFLG_UNK10000_e = 0x00010000,
daSFLG_SHOOT_CANNON_e = 0x00020000,
@@ -51,57 +51,85 @@ public:
daSFLG_UNK80000000_e = 0x80000000
};
enum daShip_c__ShipMode {
Idle = 0,
Sailing = 1,
UsingCannon = 2,
UsingSalvageArm = 3,
enum Mode_e {
MODE_WAIT_e = 0,
MODE_STEER_MOVE_e = 1,
MODE_PADDLE_MOVE_e = 2,
MODE_READY_FIRST_e = 3,
MODE_READY_SECOND_e = 4,
MODE_GET_OFF_FIRST_e = 5,
MODE_GET_OFF_SECOND_e = 6,
MODE_TALK_e = 8,
MODE_CANNON_e = 9,
MODE_CRANE_e = 10,
MODE_CRANE_UP_e = 11,
MODE_START_MODE_WARP_e = 13,
MODE_TACT_WARP_e = 14,
MODE_START_MODE_THROW_e = 16,
};
enum Part_e {
PART_WAIT_e = 0,
PART_STEER_e = 1,
PART_CANNON_e = 2,
PART_CRANE_e = 3,
};
typedef BOOL (daShip_c::*ProcFunc)();
bool checkStateFlg(daSHIP_SFLG flag) const { return mStateFlag & flag; }
bool checkHeadNoDraw() const { return checkStateFlg(daSFLG_HEAD_NO_DRAW_e); }
bool getFlyFlg() { return checkStateFlg(daSFLG_FLY_e); }
bool getJumpFlg() const { return checkStateFlg(daSFLG_JUMP_e); }
bool getLandFlg() const { return checkStateFlg(daSFLG_LAND_e); }
bool getSailOn() { return checkStateFlg(daSFLG_SAIL_ON_e); }
void onJumpRideFlg() { onStateFlg(daSFLG_JUMP_RIDE_e); }
bool checkJumpOkFlg() const { return checkStateFlg(daSFLG_JUMP_OK_e); }
bool checkShootCannon() const { return checkStateFlg(daSFLG_SHOOT_CANNON_e); }
bool checkHeadNoDraw() const { return checkStateFlg(daSFLG_HEAD_NO_DRAW_e); }
void setSteerMove() { mNextMode = MODE_STEER_MOVE_e; }
void setPaddleMove() { mNextMode = MODE_PADDLE_MOVE_e; }
void setReadyFirst() { mNextMode = MODE_READY_FIRST_e; }
void setReadySecond() { mNextMode = MODE_READY_SECOND_e; }
void setGetOffFirst() { mNextMode = MODE_GET_OFF_FIRST_e; }
void setGetOffSecond() { mNextMode = MODE_GET_OFF_SECOND_e; }
void setCannon() { mNextMode = MODE_CANNON_e; }
void setCrane() { mNextMode = MODE_CRANE_e; }
void setTactWarp() { mNextMode = MODE_TACT_WARP_e; }
int getTactWarpPosNum() const { return mTactWarpPosNum; }
void setTactWarpPosNum(int num) { mTactWarpPosNum = num; }
u32 getTactWarpID() { return mTactWarpID; }
void setTactWarpID(u32 warpID) { mTactWarpID = warpID; }
Mtx& getBodyMtx() { return m0298->getModel()->getBaseTRMtx(); }
Mtx& getBodyMtx() { return mpBodyAnm->getModel()->getBaseTRMtx(); }
void checkCraneMode() const {}
void checkCraneUpEnd() const {}
BOOL checkForceMove() const { return getTornadoActor() || getWhirlActor(); }
void checkJumpOkFlg() const {}
void checkRopeCntMax() const {}
void checkRopeDownStart() const {}
void checkSalvageDemo() const {}
void checkTornadoFlg() const {}
void checkTornadoUp() const {}
void getBeltSpeed() const {}
f32 getBeltSpeed() const { return m1044.absXZ(); }
s16 getCannonAngleX() const { return shape_angle.x + m0396 - 0x4000; }
s16 getCannonAngleY() const { return shape_angle.y + m0394; }
void getCraneAngle() const {}
void getCraneBaseAngle() const {}
s16 getCraneBaseAngle() const { return mCraneBaseAngle; }
void getCraneHookAngleY() const {}
void getCraneRipplePosX() const {}
void getCraneRipplePosY() const {}
void getCraneRipplePosZ() const {}
void getCraneTop() {}
void getFlyFlg() {}
void getHeadJntMtx() {}
void getJumpFlg() const {}
void getJumpRate() {}
void getLandFlg() const {}
void getPart() const {}
void getRopeCnt() const {}
void getSailAngle() {}
void getSailOn() {}
f32 getJumpRate() { return mJumpRate; }
u8 getPart() const { return mPart; }
s16 getRopeCnt() const { return mRopeCnt; }
s16 getSailAngle() { return mSailAngle; }
void getTactJntMtx() {}
void getTillerAngleRate() {}
void getTillerTopPosP() {}
f32 getTillerAngleRate() { return mTillerAngleRate; }
cXyz* getTillerTopPosP() { return &mTillerTopPos; }
daTornado_c* getTornadoActor() const { return mTornadoActor; }
fopAc_ac_c* getWhirlActor() const { return mWhirlActor; }
void offCraneHookFlg() {}
@@ -120,7 +148,6 @@ public:
void onCraneHookFlg() {}
void onCrashFlg() {}
void onFantomGanonBattle() {}
void onJumpRideFlg() {}
//TODO: Is this right?
void onLinkSit() { onStateFlg(daSFLG_UNK4000000_e); }
void onSceneChange() {}
@@ -130,17 +157,8 @@ public:
void onWhirlFlg(u32, s16) {}
void onWhirlFlgDirect(u32, s16) {}
void setAtnPos(const cXyz*) {}
void setCannon() {}
void setCrane() {}
void setGetOffFirst() {}
void setGetOffSecond() {}
void setPaddleMove() { m034D = 2; }
void setReadyFirst() {}
void setReadySecond() {}
void setStartModeThrow() {}
void setStartModeWarp() {}
void setSteerMove() {}
void setTactWarp() {}
BOOL bodyJointCallBack(int);
BOOL cannonJointCallBack(int);
@@ -228,8 +246,8 @@ public:
public:
/* 0x0290 */ request_of_phase_process_class mPhs;
/* 0x0298 */ mDoExt_McaMorf* m0298;
/* 0x029C */ mDoExt_McaMorf* m029C;
/* 0x0298 */ mDoExt_McaMorf* mpBodyAnm;
/* 0x029C */ mDoExt_McaMorf* mpHeadAnm;
/* 0x02A0 */ J3DTexMtx* m02A0;
/* 0x02A4 */ J3DTexMtx* m02A4;
/* 0x02A8 */ Mtx m02A8;
@@ -243,9 +261,9 @@ public:
/* 0x0348 */ u8 m0348[0x034A - 0x0348];
/* 0x034A */ s8 m034A;
/* 0x034B */ u8 m034B;
/* 0x034C */ u8 m034C;
/* 0x034D */ u8 m034D;
/* 0x034E */ u8 mShipMode;
/* 0x034C */ u8 mCurMode;
/* 0x034D */ u8 mNextMode;
/* 0x034E */ u8 mPart;
/* 0x034F */ u8 m034F;
/* 0x0350 */ u8 m0350;
/* 0x0351 */ u8 m0351;
@@ -255,7 +273,7 @@ public:
/* 0x0358 */ u32 mStateFlag;
/* 0x035C */ u32 mNextMessageNo;
/* 0x0360 */ u32 mShadowId;
/* 0x0364 */ s16 m0364;
/* 0x0364 */ s16 mSailAngle;
/* 0x0366 */ s16 m0366;
/* 0x0368 */ u8 m0368[0x036C - 0x0368];
/* 0x036C */ s16 m036C;
@@ -273,17 +291,17 @@ public:
/* 0x0384 */ s16 m0384;
/* 0x0386 */ s16 m0386;
/* 0x0388 */ s16 m0388;
/* 0x038A */ u16 m038A;
/* 0x038A */ u16 m038A; // file idx
/* 0x038C */ s16 m038C;
/* 0x038E */ s16 m038E;
/* 0x0390 */ u16 m0390;
/* 0x0392 */ u16 m0392;
/* 0x0392 */ u16 m0392; // file idx
/* 0x0394 */ s16 m0394;
/* 0x0396 */ s16 m0396;
/* 0x0398 */ s16 m0398;
/* 0x039A */ s16 m039A;
/* 0x039A */ s16 mCraneBaseAngle;
/* 0x039C */ s16 m039C;
/* 0x039E */ s16 mCurrentRopeSegmentIndex;
/* 0x039E */ s16 mRopeCnt;
/* 0x03A0 */ s16 m03A0;
/* 0x03A2 */ s16 m03A2;
/* 0x03A4 */ s16 mStickMAng;
@@ -294,7 +312,7 @@ public:
/* 0x03AE */ s16 m03AE;
/* 0x03B0 */ s16 m03B0;
/* 0x03B2 */ s16 m03B2;
/* 0x03B4 */ u16 m03B4;
/* 0x03B4 */ u16 m03B4; // file idx
/* 0x03B6 */ s16 m03B6;
/* 0x03B8 */ s16 m03B8;
/* 0x03BA */ s16 m03BA;
@@ -306,9 +324,9 @@ public:
/* 0x03D0 */ f32 m03D0;
/* 0x03D4 */ f32 m03D4;
/* 0x03D8 */ f32 m03D8;
/* 0x03DC */ f32 m03DC;
/* 0x03DC */ f32 mTillerAngleRate;
/* 0x03E0 */ f32 m03E0;
/* 0x03E4 */ f32 m03E4;
/* 0x03E4 */ f32 mJumpRate;
/* 0x03E8 */ f32 m03E8;
/* 0x03EC */ f32 mStickMVal;
/* 0x03F0 */ u8 m03F0[0x03F4 - 0x03F0];
@@ -329,7 +347,7 @@ public:
/* 0x042C */ fpc_ProcID mTactWarpID;
/* 0x0430 */ fpc_ProcID m0430;
/* 0x0434 */ cXyz* m0434;
/* 0x0438 */ cXyz m0438;
/* 0x0438 */ cXyz mTillerTopPos;
/* 0x0444 */ cXyz m0444;
/* 0x0450 */ cXyz m0450;
/* 0x045C */ cXyz m045C;
src/d/actor/d_a_player_main.cpp
+5 -10
View File
@@ -396,15 +396,10 @@ static BOOL daPy_jointBeforeCallback(u32 userArea, u16 jnt_no, J3DTransformInfo*
BOOL daPy_lk_c::jointAfterCB(int jnt_no, J3DTransformInfo* param_2, Quaternion* param_3) {
if (m34C6 != 0) {
if ((m34C6 & 1) != 0) {
param_3->x = m3658.x;
param_3->y = m3658.y;
param_3->z = m3658.z;
param_3->w = m3658.w;
*param_3 = m3658;
}
if ((m34C6 & 2) != 0) {
param_2->mScale = m3668.mScale;
param_2->mRotation = m3668.mRotation;
param_2->mTranslate = m3668.mTranslate;
*param_2 = m3668;
}
m34C6 = 0;
}
@@ -7155,11 +7150,11 @@ void daPy_lk_c::endDemoMode() {
checkNextMode(0);
} else if (daPy_getPlayerActorClass() != this) {
procControllWait_init();
} else if (dComIfGp_getShipActor()->mShipMode == 2) {
} else if (dComIfGp_getShipActor()->getPart() == daShip_c::PART_CANNON_e) {
procShipCannon_init();
} else if (dComIfGp_getShipActor()->mShipMode == 3) {
} else if (dComIfGp_getShipActor()->getPart() == daShip_c::PART_CRANE_e) {
procShipCrane_init();
} else if (dComIfGp_getShipActor()->mShipMode == 1) {
} else if (dComIfGp_getShipActor()->getPart() == daShip_c::PART_STEER_e) {
procShipSteer_init();
} else {
procShipPaddle_init();
src/d/actor/d_a_player_particle.inc
+1 -1
View File
@@ -1134,7 +1134,7 @@ void daPy_lk_c::setWaterDrop() {
return;
}
if (dKyr_player_overhead_bg_chk() && dStage_stagInfo_GetSTType(dComIfGp_getStageStagInfo()) != dStageType_MISC_e && mCurProc != PROC_KI && mAcch.m_roof_y == 1e9f) {
if (dKyr_player_overhead_bg_chk() && dStage_stagInfo_GetSTType(dComIfGp_getStageStagInfo()) != dStageType_MISC_e && mCurProc != daPyProc_DEMO_LAST_COMBO_e && mAcch.m_roof_y == C_BG_MAX_HEIGHT) {
if (m3460[0].getEmitter() == NULL) {
m3460[0].makeEmitter(dPa_name::ID_COMMON_0432, mpCLModel->getAnmMtx(0x0E), &current.pos, NULL);
}
src/d/actor/d_a_player_ship.inc
+62 -57
View File
@@ -61,46 +61,46 @@ BOOL daPy_lk_c::checkShipNotNormalMode() {
/* 8013F9B0-8013FE78 .text setShipRideArmAngle__9daPy_lk_cFiP16J3DTransformInfo */
void daPy_lk_c::setShipRideArmAngle(int jnt_no, J3DTransformInfo* param_2) {
/* Nonmatching - regalloc, math */
static cXyz arm_pos(0.0f, 0.0f, 0.0f);
static cXyz armA_offset(17.0f, 0.0f, 0.0f);
cXyz local_74;
cXyz local_68;
BOOL uVar3 = jnt_no == 0xA ? TRUE : FALSE;
BOOL uVar3 = jnt_no == 0xA;
if (uVar3) {
f32 fVar1 = m_old_fdata->getOldFrameRate();
f32 fVar2 = 1.0f / (1.0f - fVar1);
J3DTransformInfo* iVar4 = m_old_fdata->getOldFrameTransInfo(jnt_no);
param_2->mTranslate.x *= fVar2 - iVar4->mTranslate.x * fVar1;
param_2->mTranslate.y *= fVar2 - iVar4->mTranslate.y * fVar1;
param_2->mTranslate.z *= fVar2 - iVar4->mTranslate.z * fVar1;
param_2->mTranslate.x = fVar2 * (param_2->mTranslate.x - iVar4->mTranslate.x * fVar1);
param_2->mTranslate.y = fVar2 * (param_2->mTranslate.y - iVar4->mTranslate.y * fVar1);
param_2->mTranslate.z = fVar2 * (param_2->mTranslate.z - iVar4->mTranslate.z * fVar1);
local_74.set(param_2->mTranslate.x, param_2->mTranslate.y, param_2->mTranslate.z);
mDoMtx_multVec(J3DSys::mCurrentMtx, &local_74, &arm_pos);
}
local_68 = (dComIfGp_getShipActor()->m0438 - arm_pos);
f32 dVar10 = local_68.absXZ();
u32 uVar5 = cM_atan2s(local_68.y, dVar10);
local_68 = (*dComIfGp_getShipActor()->getTillerTopPosP() - arm_pos);
s16 uVar5 = cM_atan2s(local_68.y, local_68.absXZ());
mDoMtx_stack_c::transS(arm_pos.x, arm_pos.y, arm_pos.z);
f32 dVar12 = (26.3f * cM_scos(uVar5 & 0xffff));
f32 dVar8 = local_68.absXZ();
dVar10 = dVar8;
f32 f30 = (26.3f * cM_scos(uVar5));
f32 f1 = local_68.abs2XZ();
f32 f31 = std::sqrtf(f1);
if (!uVar3) {
mDoMtx_stack_c::YrotM(cM_atan2s(local_68.x, local_68.z) + -0x4000);
if (dVar10 >= dVar12) {
mDoMtx_stack_c::scaleM((dVar10 / dVar12), 1.0f, 1.0f);
if (f31 >= f30) {
mDoMtx_stack_c::scaleM((f31 / f30), 1.0f, 1.0f);
}
} else {
f32 dVar9 = (17.0f * cM_scos(uVar5 & 0xffff));
f32 dVar11 = dVar12 + dVar9;
if (dVar10 >= dVar11) {
f32 f0 = (17.0f * cM_scos(uVar5));
f32 f3 = f0 * f0;
f32 f2 = f30 * f30;
f32 f29 = f30 + f0;
if (f31 >= f29) {
mDoMtx_stack_c::YrotM(cM_atan2s(local_68.x, local_68.z) + -0x4000);
mDoMtx_stack_c::scaleM((dVar10 / dVar11), 1.0f, 1.0f);
mDoMtx_stack_c::scaleM((f31 / f29), 1.0f, 1.0f);
} else {
dVar12 = ((dVar8 + ((dVar9 * dVar9) - (dVar12 * dVar12))) / (2.0f * dVar8));
f32 f30 = ((f1 + (f3 - f2)) / (2.0f * f1));
mDoMtx_stack_c::YrotM(
(cM_atan2s(local_68.x, local_68.z) + -0x4000) -
cM_atan2s(std::sqrtf((dVar9 * dVar9) - (dVar12 * (dVar8 * dVar12))), (dVar10 * dVar12))
cM_atan2s(std::sqrtf(f3 - (f30 * (f1 * f30))), (f31 * f30))
);
}
}
@@ -132,7 +132,8 @@ void daPy_lk_c::initShipRideUseItem(int param_1, int param_2) {
if (param_1 == 0) {
return;
}
dComIfGp_getShipActor()->m034D = 2; // TODO probably inline setter
daShip_c* ship = (daShip_c*)dComIfGp_getShipActor();
ship->setPaddleMove();
gravity = 0.0f;
speed.y = 0.0f;
if (param_1 == 1) {
@@ -162,7 +163,7 @@ void daPy_lk_c::setShipRidePosUseItem() {
void daPy_lk_c::setShipRidePos(int param_0) {
daShip_c* ship = dComIfGp_getShipActor();
if (ship != NULL) {
if (ship->mStateFlag & 0x4000) {
if (ship->checkJumpOkFlg()) {
dComIfGp_setRStatus(0x12);
}
if (param_0 != 0) {
@@ -183,11 +184,11 @@ void daPy_lk_c::setShipRidePos(int param_0) {
cLib_addCalcAngleS(&m3542, 0, 5, 0x100, 0x30);
}
if (mCurProc == ANM_WARPOUT) {
mDoMtx_multVec(ship->m0298->getModel()->getBaseTRMtx(), &l_ship_offset3, &current.pos);
mDoMtx_multVec(ship->getBodyMtx(), &l_ship_offset3, &current.pos);
} else if (mCurProc == ANM_SETBOOTS && m34D8 != 0) {
mDoMtx_multVec(ship->m0298->getModel()->getBaseTRMtx(), &l_ship_offset2, &current.pos);
mDoMtx_multVec(ship->getBodyMtx(), &l_ship_offset2, &current.pos);
} else {
mDoMtx_multVec(ship->m0298->getModel()->getBaseTRMtx(), &l_ship_offset, &current.pos);
mDoMtx_multVec(ship->getBodyMtx(), &l_ship_offset, &current.pos);
}
if (checkShipNotNormalMode()) {
mBodyAngle.y = 0;
@@ -202,20 +203,20 @@ void daPy_lk_c::setShipRidePos(int param_0) {
mFrameCtrlUpper[UPPER_MOVE2_e].setRate(
(1.0f - daPy_HIO_ship_c0::m.field_0xC) * fVar2 + daPy_HIO_ship_c0::m.field_0xC
);
if ((ship->mStateFlag & 0x40) != 0) {
if (ship->m03E4 > 0.6f) {
if (ship->getJumpFlg()) {
if (ship->getJumpRate() > 0.6f) {
voiceStart(6);
} else if (ship->m03E4 > 0.2f) {
} else if (ship->getJumpRate() > 0.2f) {
voiceStart(7);
}
setSingleMoveAnime(ANM_SHIP_JUMP1, 1.0f, 0.0f, -1, 20.0f);
}
if (ship->mStateFlag & 0x80) {
if (ship->getLandFlg()) {
setSingleMoveAnime(ANM_SHIP_JUMP2, 1.0f, 3.0f, -1, 3.0f);
}
if (m_anm_heap_under[UNDER_MOVE0_e].mIdx == LKANM_BCK_SHIP_JUMP2) {
if (mFrameCtrlUnder[UNDER_MOVE0_e].getRate() < 0.01f) {
if ((ship->mStateFlag & 1) != 0) {
if (ship->getFlyFlg()) {
setSingleMoveAnime(ANM_SHIP_JUMP1, 1.0f, 0.0f, -1, 20.0f);
} else {
setSingleMoveAnime(ANM_VOYAGE1, 1.0f, 0.0f, -1, 5.0f);
@@ -226,7 +227,7 @@ void daPy_lk_c::setShipRidePos(int param_0) {
}
s16 sVar4;
if (m_anm_heap_under[UNDER_MOVE0_e].mIdx == LKANM_BCK_VOYAGE1) {
sVar4 = -daPy_HIO_ship_c0::m.field_0x4 * ship->m03DC;
sVar4 = -daPy_HIO_ship_c0::m.field_0x4 * ship->getTillerAngleRate();
} else {
sVar4 = 0;
}
@@ -293,7 +294,6 @@ void daPy_lk_c::setShipAttnetionBodyAngle() {
/* 801405F0-80140C88 .text changeShipEndProc__9daPy_lk_cFv */
BOOL daPy_lk_c::changeShipEndProc() {
/* Nonmatching - missing daShip_c inline */
daShip_c* ship = (daShip_c*)dComIfGp_getShipActor();
if (ship == NULL) {
return checkNextMode(0);
@@ -306,7 +306,7 @@ BOOL daPy_lk_c::changeShipEndProc() {
}
}
if (mCurProc != daPyProc_SHIP_SCOPE_e && mCurProc != daPyProc_SHIP_BOW_e && mCurProc != daPyProc_SHIP_HOOKSHOT_e &&
(mCurProc != daPyProc_SHIP_BOOMERANG_e || mEquipItem != dItem_BOOMERANG_e) && (ship->mStateFlag & 1) == 0)
(mCurProc != daPyProc_SHIP_BOOMERANG_e || mEquipItem != dItem_BOOMERANG_e) && !ship->getFlyFlg())
{
setTalkStatus();
if (orderTalk()) {
@@ -314,7 +314,7 @@ BOOL daPy_lk_c::changeShipEndProc() {
}
}
if (dComIfGp_getMiniGameType() != 1 && ship->speedF < 3.0f) {
if (ship->m1044.absXZ() < 3.0f) {
if (ship->getBeltSpeed() < 3.0f) {
if (((!checkShipNotNormalMode() || m_anm_heap_under[UNDER_MOVE0_e].mIdx == LKANM_BCK_FREEA) ||
m_anm_heap_under[UNDER_MOVE0_e].mIdx == LKANM_BCK_FREEB) ||
m_anm_heap_under[UNDER_MOVE0_e].mIdx == LKANM_BCK_FREED)
@@ -332,9 +332,9 @@ BOOL daPy_lk_c::changeShipEndProc() {
}
}
}
if (mCurProc != daPyProc_SHIP_SCOPE_e && ((ship->mStateFlag & 1) == 0)) {
if (mCurProc != daPyProc_SHIP_SCOPE_e && !ship->getFlyFlg()) {
if (dComIfGp_getDoStatus() == 0) {
if (ship->mShipMode == 1 || ship->checkForceMove() || (ship->speedF < 3.0f && ship->mShipMode != 0)) {
if (ship->getPart() == daShip_c::PART_STEER_e || ship->checkForceMove() || (ship->speedF < 3.0f && ship->getPart() != daShip_c::PART_WAIT_e)) {
dComIfGp_setDoStatus(8);
}
}
@@ -452,7 +452,7 @@ void daPy_lk_c::initShipBaseAnime() {
void daPy_lk_c::initShipCraneAnime() {
daPy_ANM dVar1;
if ((s16)dComIfGp_getShipActor()->m039A > 0) {
if (dComIfGp_getShipActor()->getCraneBaseAngle() > 0) {
dVar1 = ANM_SALVRWAIT;
mProcVar0.m3570 = 3;
m3574 = 3;
@@ -481,19 +481,19 @@ BOOL daPy_lk_c::procShipReady_init() {
mVelocity = 0.0f;
s16 sVar3 = fopAcM_searchActorAngleY(ship, this);
if ((s16)(sVar3 - ship->shape_angle.y) > 0) {
mDoMtx_multVec(ship->m0298->getModel()->getBaseTRMtx(), &l_ship_ledge, &current.pos);
mDoMtx_multVec(ship->getBodyMtx(), &l_ship_ledge, &current.pos);
shape_angle.y = ship->shape_angle.y + -0x4000;
m34D4 = shape_angle.y;
m34D0 = 0;
} else {
mDoMtx_multVec(ship->m0298->getModel()->getBaseTRMtx(), &l_ship_redge, &current.pos);
mDoMtx_multVec(ship->getBodyMtx(), &l_ship_redge, &current.pos);
shape_angle.y = ship->shape_angle.y + 0x4000;
m34D4 = shape_angle.y + 0x8000;
m34D0 = 1;
}
current.angle.y = shape_angle.y;
mProcVar0.m3570 = 0;
ship->m034D = 3;
ship->setReadyFirst();
dComIfGp_setPlayerStatus0(0, daPyStts0_UNK1000000_e);
swimOutAfter(1);
offNoResetFlg0(daPyFlg0_SHIP_DROP);
@@ -514,9 +514,9 @@ BOOL daPy_lk_c::procShipReady() {
if (mProcVar0.m3570 == 0) {
if (m34D0 == 0) {
mDoMtx_multVec(ship->m0298->getModel()->getBaseTRMtx(), &l_ship_ledge, &current.pos);
mDoMtx_multVec(ship->getBodyMtx(), &l_ship_ledge, &current.pos);
} else {
mDoMtx_multVec(ship->m0298->getModel()->getBaseTRMtx(), &l_ship_redge, &current.pos);
mDoMtx_multVec(ship->getBodyMtx(), &l_ship_redge, &current.pos);
}
if (mFrameCtrlUnder[UNDER_MOVE0_e].getRate() < 0.01f) {
mProcVar0.m3570 = 1;
@@ -524,7 +524,7 @@ BOOL daPy_lk_c::procShipReady() {
setSingleMoveAnime(ANM_WALK, daPy_HIO_move_c0::m.field_0x40, 0.0f, -1, 5.0f);
m34C2 = 10;
offModeFlg(ModeFlg_HANG | ModeFlg_00000400);
ship->m034D = 4;
ship->setReadySecond();
m35A0 = ship->current.pos.y;
}
} else {
@@ -552,8 +552,8 @@ BOOL daPy_lk_c::procShipJumpRide_init() {
gravity = 0.0f;
speed.y = 0.0f;
mVelocity = 0.0f;
ship->m034D = 2;
ship->mStateFlag = ship->mStateFlag | 0x2000;
ship->setPaddleMove();
ship->onJumpRideFlg();
setSingleMoveAnime(ANM_SLIPICE, 1.0f, 0.0f, -1, 5.0f);
setShipRidePos(0);
offNoResetFlg0(daPyFlg0_SHIP_DROP);
@@ -577,7 +577,7 @@ BOOL daPy_lk_c::procShipSteer_init() {
offNoResetFlg0(daPyFlg0_UNK1);
daShip_c* ship = dComIfGp_getShipActor();
if (mCurProc == daPyProc_SHIP_STEER_e) {
ship->m034D = 1;
ship->setSteerMove();
return false;
}
@@ -586,7 +586,7 @@ BOOL daPy_lk_c::procShipSteer_init() {
gravity = 0.0f;
mVelocity = 0.0f;
speed.y = 0.0f;
ship->m034D = 1;
ship->setSteerMove();
initShipBaseAnime();
setShipRidePos(1);
dComIfGp_setPlayerStatus0(0, daPyStts0_SHIP_RIDE_e);
@@ -622,7 +622,7 @@ BOOL daPy_lk_c::procShipPaddle_init() {
gravity = 0.0f;
speed.y = 0.0f;
mVelocity = 0.0f;
ship->m034D = 2;
ship->setPaddleMove();
initShipBaseAnime();
if (!bVar1) {
setOldRootQuaternion(0, shape_angle.y - ship->shape_angle.y, 0);
@@ -702,7 +702,7 @@ BOOL daPy_lk_c::procShipScope_init(int param_0) {
commonProcInit(daPyProc_SHIP_SCOPE_e);
deleteEquipItem(TRUE);
gravity = 0.0f;
ship->m034D = 2;
ship->setPaddleMove();
setShipRidePos(0);
setSingleMoveAnime(ANM_WAITS, daPy_HIO_move_c0::m.field_0x38, 0.0f, -1, 5.0f);
dComIfGp_setPlayerStatus0(0, daPyStts0_SHIP_RIDE_e);
@@ -748,7 +748,7 @@ BOOL daPy_lk_c::procShipBoomerang_init() {
commonProcInit(daPyProc_SHIP_BOOMERANG_e);
deleteEquipItem(TRUE);
gravity = 0.0f;
ship->m034D = 2;
ship->setPaddleMove();
mEquipItem = dItem_BOOMERANG_e;
setSingleMoveAnime(ANM_ATNRS, 0.0f, 0.0f, -1, 5.0f);
setActAnimeUpper(LKANM_BCK_BOOMWAIT, UPPER_MOVE2_e, 0.0f, 0.0f, -1, -1.0f);
@@ -825,7 +825,7 @@ BOOL daPy_lk_c::procShipHookshot_init() {
commonProcInit(daPyProc_SHIP_HOOKSHOT_e);
deleteEquipItem(TRUE);
gravity = 0.0f;
ship->m034D = 2;
ship->setPaddleMove();
mEquipItem = dItem_HOOKSHOT_e;
m355C = 10;
setSingleMoveAnime(ANM_ATNLS, 0.0f, 0.0f, -1, 5.0f);
@@ -902,7 +902,7 @@ BOOL daPy_lk_c::procShipBow_init() {
commonProcInit(daPyProc_SHIP_BOW_e);
deleteEquipItem(TRUE);
gravity = 0.0f;
ship->m034D = 2;
ship->setPaddleMove();
if (mDemo.getDemoMode() == daPy_demo_c::DEMO_UNK44_e) {
mEquipItem = dItem_BOW_e;
} else {
@@ -972,7 +972,7 @@ BOOL daPy_lk_c::procShipCannon_init() {
deleteEquipItem(TRUE);
gravity = 0.0f;
mVelocity = 0.0f;
ship->m034D = 9;
ship->setCannon();
initShipBaseAnime();
setShipRidePos(1);
dComIfGp_setPlayerStatus0(0, daPyStts0_SHIP_RIDE_e);
@@ -1005,8 +1005,8 @@ BOOL daPy_lk_c::procShipCrane_init() {
deleteEquipItem(TRUE);
gravity = 0.0f;
mVelocity = 0.0f;
ship->m034D = 10;
if ((s16)ship->mCurrentRopeSegmentIndex != 0) {
ship->setCrane();
if (ship->getRopeCnt() != 0) {
initShipCraneAnime();
} else {
initShipBaseAnime();
@@ -1021,6 +1021,11 @@ BOOL daPy_lk_c::procShipCrane_init() {
/* 80142458-80142920 .text procShipCrane__9daPy_lk_cFv */
BOOL daPy_lk_c::procShipCrane() {
/* Nonmatching */
// The following daShip_c inlines are used in this function:
// checkRopeDownStart
// checkRopeCntMax
// checkCraneUpEnd
// checkSalvageDemo
}
/* 80142920-80142A5C .text procShipGetOff_init__9daPy_lk_cFv */
@@ -1041,7 +1046,7 @@ BOOL daPy_lk_c::procShipGetOff_init() {
m370C.x = current.pos.x + cM_ssin(shape_angle.y) * l_ship_ledge.x;
m370C.y = ship->current.pos.y + l_ship_ledge.y;
m370C.z = current.pos.z + cM_scos(shape_angle.y) * l_ship_ledge.x;
ship->m034D = 5;
ship->setGetOffFirst();
mBodyAngle.y = 0;
m35A0 = ship->current.pos.y;
return true;
@@ -1071,7 +1076,7 @@ BOOL daPy_lk_c::procShipGetOff() {
speed.y = daPy_HIO_ship_c0::m.field_0x14;
mProcVar0.m3570 = 1;
m34C2 = 1;
ship->m034D = 6;
ship->setGetOffSecond();
onModeFlg(ModeFlg_MIDAIR);
}
} else {
@@ -1094,7 +1099,7 @@ BOOL daPy_lk_c::procShipRestart_init() {
daShip_c* ship = dComIfGp_getShipActor();
commonProcInit(daPyProc_SHIP_RESTART_e);
gravity = 0.0f;
ship->m034D = 2;
ship->setPaddleMove();
setShipRidePos(1);
setSingleMoveAnime(ANM_SEARESET, 1.0f, 0.0f, -1, -1.0f);
dComIfGp_setPlayerStatus0(0, daPyStts0_SHIP_RIDE_e);
src/d/actor/d_a_player_tact.inc
+1 -1
View File
@@ -764,7 +764,7 @@ BOOL daPy_lk_c::procTactPlayEnd() {
dComIfG_getTimerPtr()->deleteRequest();
}
procShipPaddle_init();
ship->m034D = 0xE; // TODO inline
ship->setTactWarp();
}
}
}
src/d/actor/d_a_ship.cpp
+397 -377
View File
File diff suppressed because it is too large Load Diff