falso
/
tp
mirror of https://github.com/zeldaret/tp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

match d_a_npc_tk for debug (#3046) 

* match d_a_npc_tk for debug

* fix macro usage

* fix whitespace
This commit is contained in:
roeming 2026-01-17 08:45:52 -05:00 committed by GitHub
parent b1f44ce532
commit 740387eb4f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 397 additions and 347 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
include/SSystem/SComponent/c_angle.h
View File

@ -3,19 +3,31 @@
#include "SSystem/SComponent/c_xyz.h"
#define ADD_ANGLE(x, y) ((x) += (s16)(y))
#define SUB_ANGLE(x, y) ((x) -= (s16)(y))
#define MULT_ANGLE(x, y) ((x) *= (s16)(y))
#define ADD_VAR(x, y) ((x) += (y))
#define SUB_VAR(x, y) ((x) -= (y))
#define MULT_VAR(x, y) ((x) *= (y))
#define ADD_VAR_CAST(x, y, t) ((x) += (t)(y))
#define SUB_VAR_CAST(x, y, t) ((x) -= (t)(y))
#define MULT_VAR_CAST(x, y, t) ((x) *= (t)(y))
#define ADD_ANGLE(x, y) ADD_VAR_CAST(x, y, s16)
#define SUB_ANGLE(x, y) SUB_VAR_CAST(x, y, s16)
#define MULT_ANGLE(x, y) MULT_VAR_CAST(x, y, s16)
// There are some angles that weren't sign-extended until the shield version
#if !PLATFORM_SHIELD
#define ADD_ANGLE_2(x, y) ((x) += (y))
#define SUB_ANGLE_2(x, y) ((x) -= (y))
#define MULT_ANGLE_2(x, y) ((x) *= (y))
#define ADD_ANGLE_2 ADD_VAR
#define SUB_ANGLE_2 SUB_VAR
#define MULT_ANGLE_2 MULT_VAR
#define ADD_S8_2 ADD_VAR
#else
#define ADD_ANGLE_2(x, y) ADD_ANGLE(x, y)
#define SUB_ANGLE_2(x, y) SUB_ANGLE(x, y)
#define MULT_ANGLE_2(x, y) MULT_ANGLE(x, y)
#define ADD_ANGLE_2 ADD_ANGLE
#define SUB_ANGLE_2 SUB_ANGLE
#define MULT_ANGLE_2 MULT_ANGLE
#define ADD_S8_2(x, y) ADD_VAR_CAST(x, y, s8)
#endif
#define DEG2S_CONSTANT (0x8000 / 180.0f)

3
include/d/actor/d_a_ni.h
View File

@ -58,8 +58,7 @@ public:
mDoMtx_stack_c::multVecZero(&newPos);
current.pos = newPos;
old.pos = current.pos;
speed.y = 0.0f;
speedF = 0.0f;
speedF = speed.y = 0.0f;
mpMorf->getModel()->setBaseTRMtx(mtx);
}

4
include/d/d_camera.h
View File

@ -1043,9 +1043,9 @@ public:
int Set(cXyz, cXyz);
int Set(cXyz, cXyz, f32, s16);
int Set(cXyz, cXyz, s16, f32);
void Reset(cXyz, cXyz);
int Reset(cXyz, cXyz);
int Reset();
void Reset(cXyz, cXyz, f32, s16);
int Reset(cXyz, cXyz, f32, s16);
f32 shakeCamera();
int StartShake(s32, u8*, s32, cXyz);
int StopShake();

699
src/d/actor/d_a_npc_tk.cpp
View File

File diff suppressed because it is too large Load Diff

8
src/d/d_camera.cpp
View File

@ -10411,18 +10411,18 @@ int dCamera_c::Set(cXyz i_center, cXyz i_eye, s16 i_bank, f32 i_fovy) {
return 1;
}
void dCamera_c::Reset(cXyz i_center, cXyz i_eye, f32 i_fovy, s16 i_bank) {
int dCamera_c::Reset(cXyz i_center, cXyz i_eye, f32 i_fovy, s16 i_bank) {
mCenter = i_center;
mEye = i_eye;
mFovy = i_fovy;
mBank = cSAngle(i_bank);
Reset();
return Reset();
}
void dCamera_c::Reset(cXyz i_center, cXyz i_eye) {
int dCamera_c::Reset(cXyz i_center, cXyz i_eye) {
mCenter = i_center;
mEye = i_eye;
Reset();
return Reset();
}
int dCamera_c::Reset() {