Skip to content

Commit 328fe4f

Browse files
committed
Remove changes causing regression in debug
1 parent c3bcad0 commit 328fe4f

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

src/d/actor/d_a_horse.cpp

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1708,13 +1708,12 @@ int daHorse_c::checkHorseNoMove(int param_0) {
17081708
spA = field_0x1714;
17091709
}
17101710

1711-
f32 sp18;
17121711
f32 sp28;
1713-
f32 var_f27;
1714-
f32 var_f28;
1712+
f32 var_f31;
17151713
f32 var_f30;
17161714
f32 var_f29;
1717-
f32 var_f31;
1715+
f32 var_f28;
1716+
f32 var_f27;
17181717

17191718
if (param_0 != 0) {
17201719
if (checkEndResetStateFlg0(ERFLG0_UNK_200) || (checkStateFlg0(FLG0_UNK_100000) && (m_procID == PROC_MOVE_e || m_procID == PROC_TURN_e || m_procID == PROC_STOP_e) && ((current.pos.z < -33500.0f && abs(shape_angle.y) > 0x4000) || (current.pos.z > -20500.0f && abs(shape_angle.y) < 0x4000)))) {
@@ -1730,7 +1729,6 @@ int daHorse_c::checkHorseNoMove(int param_0) {
17301729
var_f31 *= var_f31;
17311730

17321731
var_f31 = 200.0f + (300.0f * var_f31);
1733-
17341732
var_f29 = cM_ssin(current.angle.y);
17351733
var_f28 = cM_scos(current.angle.y);
17361734
sp28 = -var_f31 * cM_ssin(spA);
@@ -1755,8 +1753,9 @@ int daHorse_c::checkHorseNoMove(int param_0) {
17551753

17561754
onStateFlg0(FLG0_UNK_100);
17571755
BOOL line_cross = dComIfG_Bgsp().LineCross(&m_linechk);
1756+
offStateFlg0(FLG0_UNK_100);
17581757

1759-
if (offStateFlg0(FLG0_UNK_100), line_cross) {
1758+
if (line_cross) {
17601759
cM3dGPla plane;
17611760
dComIfG_Bgsp().GetTriPla(m_linechk, &plane);
17621761
sp50 = m_linechk.GetCross();
@@ -1785,8 +1784,9 @@ int daHorse_c::checkHorseNoMove(int param_0) {
17851784

17861785
sp50.y = 200.0f + current.pos.y;
17871786

1787+
f32 sp18;
17881788
if (param_0 != 0 && speedF > (0.5f * m_normalMaxSpeedF)) {
1789-
sp18 = 500.0f;
1789+
sp18 = 500.0;
17901790
} else {
17911791
sp18 = 200.0f;
17921792
}

0 commit comments

Comments
 (0)