mirror of
https://github.com/TwilitRealm/dusklight
synced 2026-08-16 12:24:45 -04:00
Big cast cleanup (#3076)
* 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:
@@ -456,7 +456,7 @@ void daNPC_TK_c::initPerchDemo(int param_0) {
|
||||
mPathStep2 = cM_rndFX(5.0f);
|
||||
|
||||
if (mPathStep2 < 0) {
|
||||
ADD_S8_2(mPathStep2, mpPath1->m_num);
|
||||
S8_ADD_2(mPathStep2, mpPath1->m_num);
|
||||
}
|
||||
|
||||
if (mPathStep2 >= mpPath1->m_num || mPathStep2 < 0) {
|
||||
@@ -1128,8 +1128,8 @@ void daNPC_TK_c::executeAway() {
|
||||
}
|
||||
|
||||
void daNPC_TK_c::setCarryActorMtx() {
|
||||
field_0x6a8 += (s16)0x6bc;
|
||||
field_0x6a6 = cM_ssin(field_0x6a8) * 2048.0f + 4096.0f;
|
||||
ANGLE_ADD(field_0x6a8, 0x6bc);
|
||||
field_0x6a6 = cM_ssin(field_0x6a8) * (f32)0x800 + (f32)0x1000;
|
||||
if (field_0x634 == NULL) {
|
||||
return;
|
||||
}
|
||||
@@ -1310,8 +1310,7 @@ void daNPC_TK_c::executeBack() {
|
||||
|
||||
shape_angle.y += field_0x69e;
|
||||
current.angle.y = shape_angle.y;
|
||||
|
||||
shape_angle.x -= (s16)(0x300 + nREG_S(0));
|
||||
ANGLE_SUB(shape_angle.x, 0x300 + nREG_S(0));
|
||||
|
||||
if (shape_angle.x < -0x3000) {
|
||||
shape_angle.x = -0x3000;
|
||||
|
||||
Reference in New Issue
Block a user