mirror/tww
1
0
Fork 0
mirror of https://github.com/zeldaret/tww.git synced 2026-09-06 02:38:11 -04:00
Code Issues Packages Projects Releases Wiki Activity

Minor cleanup

Browse Source 
Inlines, wrong indentation, enums, private fields, etc
This commit is contained in:
LagoLunatic
2026-07-23 17:48:51 -04:00
parent 2115d05965
commit 4efda6f355
57 changed files with 1696 additions and 1836 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/d/actor/d_a_ship.cpp
+3 -10
View File
@@ -1262,7 +1262,6 @@ BOOL daShip_c::checkNextMode(int i_curMode) {
tgRVecP = mSph.GetTgRVecP();
tgHitPos = mSph.GetTgHitPosP();
tgHitObj = mSph.GetTgHitGObj();
}
else {
dCcD_Cyl* cyl = mCyl;
@@ -1781,7 +1780,6 @@ BOOL daShip_c::procCannon() {
cLib_addCalcAngleS(&m0396, cM_atan2s(-cannonPos.y, cannonPos.absXZ()) + 0x4000, 5, 0x180, 0x40);
cLib_addCalcAngleS(&m0394, cM_atan2s(cannonPos.x, cannonPos.z) - shape_angle.y, 5, 0x180, 0x40);
} else if (!mDoCPd_R_LOCK_BUTTON(0)) {
float adjust = mStickMVal * (m0404 * 4.0f + 1.0f);
m0396 += (adjust * 384.0f) * cM_scos(mStickMAng);
@@ -2986,7 +2984,6 @@ void daShip_c::setEffectData(float param_1, short param_2) {
mWaveL.stop();
mSplash.stop();
}
}
fVar3 = speedF + 150.0f;
mEffPos.set(current.pos.x + fVar3 * cM_ssin(shape_angle.y), param_1, current.pos.z + fVar3 * cM_scos(shape_angle.y));
@@ -3786,7 +3783,7 @@ BOOL daShip_c::execute() {
fVar4 = m0404 * 30.0f + 10.0f;
// Bug? This room check assumes we're on the sea without checking?
if (dComIfGs_getBombNum() == 0 && fopAcM_GetRoomNo(this) == dIsleRoom_OutsetIsland_e) {
fVar4 *= 1.2f;
fVar4 *= 1.2f;
}
}
firstDecrementShipSpeed(fVar4);
@@ -3869,7 +3866,6 @@ BOOL daShip_c::execute() {
fopAcM_posMove(this, mStts.GetCCMoveP());
if (dComIfGp_event_runCheck()) {
m1044 = cXyz::Zero;
}
else {
cXyz sp108;
@@ -3881,7 +3877,6 @@ BOOL daShip_c::execute() {
}
else {
cLib_addCalcPosXZ(&m1044, cXyz::Zero, 0.05f, 0.1f, 0.02f);
}
current.pos += m1044;
}
@@ -4014,7 +4009,6 @@ BOOL daShip_c::execute() {
if (mProc != &daShip_c::procCannon) {
m0396 = getAnglePartRate() * 0x4000;
m0394 *= getAnglePartRate();
}
mpCannonModel->calc();
@@ -4134,8 +4128,8 @@ BOOL daShip_c::execute() {
r23_2 = TRUE;
}
else if ((mCurMode == 10 || mCurMode == 11) && m0434 && mRopeCnt > 0) {
spC0 = *m0434 - eyePos;
r23_2 = TRUE;
spC0 = *m0434 - eyePos;
r23_2 = TRUE;
}
else if (mCurMode == 8 || distXz > 125.0f) {
if (
@@ -4348,7 +4342,6 @@ BOOL daShip_c::execute() {
if (mPart == PART_STEER_e) {
dComIfGp_setPlayerStatus1(0, daPyStts1_SAIL_e);
mDoAud_setShipSailState(1);
}
else {
dComIfGp_clearPlayerStatus1(0, daPyStts1_SAIL_e);