mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-08-16 12:24:45 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into 26-02-27-allocator-isolation

Browse Source
This commit is contained in:
PJB3005
2026-03-05 00:15:09 +01:00
parent 038ef4216f 3c6552dbd2
commit 3ffc3266d7
5530 changed files with 252979 additions and 26830 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/d/actor/d_a_horse.cpp
+9 -9
View File
@@ -18,6 +18,7 @@
#include "Z2AudioLib/Z2Instances.h"
#include "JSystem/JAudio2/JAUSectionHeap.h"
#include <cmath>
#include <cstring>
#define ANM_HS_BACK_WALK 6
#define ANM_HS_WALK_START 7
@@ -1086,7 +1087,7 @@ int daHorse_c::checkDemoAction() {
void daHorse_c::setStickRodeoMove() {
if (m_rodeoPath != NULL) {
Vec* path_pnt_pos = &m_rodeoPath->m_points[m_rodeoPoint].m_position;
BE(Vec)* path_pnt_pos = &m_rodeoPath->m_points[m_rodeoPoint].m_position;
cXyz pos_vec(path_pnt_pos->x - current.pos.x, path_pnt_pos->y - current.pos.y, path_pnt_pos->z - current.pos.z);
f32 dist_to_pnt = pos_vec.absXZ();
@@ -2668,9 +2669,9 @@ int daHorse_c::setLegAngle(f32 param_0, int param_1, int param_2, s16* param_3)
sp8C = *sp18 - *sp1C;
sp80 = *sp14 - *sp18;
param_3[i] += (s16)(cM_atan2s(spA4.y, spA4.z) - cM_atan2s(sp8C.y, sp8C.z));
ANGLE_ADD(param_3[i], cM_atan2s(spA4.y, spA4.z) - cM_atan2s(sp8C.y, sp8C.z));
// i don't like this, but it matches debug and release, param_3[i+1] does not match debug
(param_3 + 1)[i] += (s16)(cM_atan2s(sp98.y, sp98.z) - cM_atan2s(sp80.y, sp80.z));
ANGLE_ADD((param_3 + 1)[i], cM_atan2s(sp98.y, sp98.z) - cM_atan2s(sp80.y, sp80.z));
if (i == 0) {
spC0[3].y += param_0 * var_f27;
@@ -3324,8 +3325,8 @@ int daHorse_c::callHorseSubstance(cXyz const* i_pos) {
if (m_path != NULL && (checkStateFlg0(FLG0_NO_DRAW_WAIT) || dist_xz2 > SQUARE(2000.0f))) {
daAlink_c* player = daAlink_getAlinkActorClass();
Vec* farthest_pos;
Vec* path_pnt_pos;
BE(Vec)* farthest_pos;
BE(Vec)* path_pnt_pos;
for (int i = 0; i < m_path->m_num; i++) {
path_pnt_pos = &m_path->m_points[i].m_position;
@@ -3813,7 +3814,7 @@ int daHorse_c::procTurnInit(int param_0) {
field_0x171e = shape_angle.y + 0x8000;
if (!dComIfGp_event_runCheck() && !checkStateFlg0(FLG0_UNK_4000000)) {
field_0x170a += (s16)(f32)0x8000;
ANGLE_ADD(field_0x170a, (f32)0x8000);
} else if (checkStateFlg0(FLG0_UNK_4000000)) {
field_0x171e = shape_angle.y;
}
@@ -3949,7 +3950,7 @@ int daHorse_c::procTurn() {
break;
}
shape_angle.y += (s16)0x2000;
ANGLE_ADD(shape_angle.y, 0x2000);
current.angle.y = shape_angle.y;
}
@@ -4344,8 +4345,7 @@ int daHorse_c::execute() {
current.pos -= *m_cc_stts.GetCCMoveP();
break;
}
shape_angle.y += (s16)0x2000;
ANGLE_ADD(shape_angle.y, 0x2000);
current.angle.y = shape_angle.y;
}