mirror/tp
1
0
Fork 0
mirror of https://github.com/zeldaret/tp synced 2026-06-29 03:31:08 -04:00
Code Issues Packages Projects Releases Wiki Activity

Big cast cleanup (#3076)

Browse Source 
* Big cast cleanup

* fix for name conflict

* rename header

* rename cast macros

* fix rename mistake

---------

Co-authored-by: roeming <roeming@users.noreply.github.com>
This commit is contained in:
roeming
2026-02-20 05:48:29 -05:00
committed by GitHub
parent 95c3626771
commit 0558bde1e6
138 changed files with 516 additions and 470 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/d/actor/d_a_e_ym.cpp
+14 -14
View File
@@ -964,13 +964,13 @@ void daE_YM_c::executeEscape() {
cLib_chaseF(&speedF, 20.0f, 1.0f);
setMoveSound(0);
if (mAcch.ChkWallHit()) {
field_0x6e4 += (s16) 0x800;
ANGLE_ADD(field_0x6e4, 0x800);
}
if (field_0x6e8 >= 0) {
field_0x6e6 -= (s16) 200;
ANGLE_SUB(field_0x6e6, 200);
} else {
field_0x6e6 += (s16) 200;
ANGLE_ADD(field_0x6e6, 200);
}
field_0x6e8 += field_0x6e6;
@@ -1971,9 +1971,9 @@ void daE_YM_c::executeFly() {
current.angle.y = cLib_targetAngleY(&current.pos, &mPrevPos);
current.angle.x = cLib_targetAngleX(&current.pos, &mPrevPos);
if ((s16)(cLib_targetAngleY(&current.pos, &player_pos) - current.angle.y) < 0) {
current.angle.y += (s16) 0x3000;
ANGLE_ADD(current.angle.y, 0x3000);
} else {
current.angle.y -= (s16) 0x3000;
ANGLE_SUB(current.angle.y, 0x3000);
}
}
}
@@ -2080,9 +2080,9 @@ void daE_YM_c::executeFly() {
} else {
tgt_ang_y = cLib_targetAngleY(&current.pos, &mPrevPos);
if (s16(cLib_targetAngleY(&current.pos, &player_pos) - tgt_ang_y) < 0) {
tgt_ang_y += (s16) 0x3000;
ANGLE_ADD(tgt_ang_y, 0x3000);
} else {
tgt_ang_y -= (s16) 0x3000;
ANGLE_SUB(tgt_ang_y, 0x3000);
}
cLib_chaseAngleS(&current.angle.y, tgt_ang_y, 0x400);
@@ -2100,7 +2100,7 @@ void daE_YM_c::executeFly() {
}
}
field_0x6e4 += (s16) 0x800;
ANGLE_ADD(field_0x6e4, 0x800);
current.pos.y += cM_ssin(field_0x6e4) * 3.0f;
}
@@ -2176,7 +2176,7 @@ void daE_YM_c::executeFlyAttack() {
case 4:
case 5: {
field_0x6e4 += (s16) 0x800;
ANGLE_ADD(field_0x6e4, 0x800);
current.pos.y += cM_ssin(field_0x6e4) * 3.0f;
cLib_chaseF(&speed.y, 0.0f, 3.0f);
cLib_chaseF(&speedF, 0.0f, 3.0f);
@@ -2537,12 +2537,12 @@ void daE_YM_c::executeSwitch() {
cLib_chaseF(&field_0x6dc, 0.0f, 15.0f);
setMoveSound(0);
if (mAcch.ChkWallHit()) {
field_0x6e4 += (s16) 0x800;
ANGLE_ADD(field_0x6e4, 0x800);
}
if (field_0x6e8 >= 0) {
field_0x6e6 -= (s16) 200;
ANGLE_SUB(field_0x6e6, 200);
} else {
field_0x6e6 += (s16) 200;
ANGLE_ADD(field_0x6e6, 200);
}
field_0x6e8 += field_0x6e6;
cLib_addCalcAngleS(&shape_angle.y, field_0x6e4 + field_0x6e8, 4, 0x1000, 0x100);
@@ -2742,7 +2742,7 @@ void daE_YM_c::executeFire() {
default:
break;
}
field_0x6e4 += (s16) 0x2000;
ANGLE_ADD(field_0x6e4, 0x2000);
current.pos.y += cM_ssin(field_0x6e4) * 3.0f;
if (mMode) {
mSound.startCreatureSoundLevel(Z2SE_EN_YM_FLY, 0, -1);
@@ -2851,7 +2851,7 @@ void daE_YM_c::executeRiver() {
case 2: {
setRiverAttention();
field_0x6e8 += (s16) 0x200;
ANGLE_ADD(field_0x6e8, 0x200);
current.pos.y += cM_ssin(field_0x6e8 << 1) * 15.0f;
f32 my_float_val = cM_scos(field_0x6e8) * 15.0f;
current.pos.x += my_float_val * cM_ssin(shape_angle.y);