mirror of
https://github.com/zeldaret/tp
synced 2026-05-30 17:06:11 -04:00
Clean up code, remove fakematches, add UNUSED, enable warnings (#2992)
* Remove NDEBUG_DEFINED fakematch, clean up getName temps * Fix ifdef * Fix bad JSystem pch ifdef breaking decomp.me * Remove Acch Chk fakematches * Private Acch fields * Fix some clangd errors in headers * Add UNUSED macro for matching debug parameters * Enable clangd unused-parameter warning * Remove extern from initializers Probably added by dol2asm? * Fix process profile definitions * Remove leftover dol2asm address comments * Remove some unnecessary double casts * Enable some more clangd warnings * Fix missing usages of fopAcM_ct * Fix wrong enum usage * Fix more fakematches
This commit is contained in:
@@ -318,11 +318,11 @@ void daObjStone_c::mode_proc_call() {
|
||||
if (mCollider.ChkAtHit()) {
|
||||
init_modeBreak();
|
||||
}
|
||||
bool isGroundLanding = mChkObj.ChkGroundLanding() != 0;
|
||||
u32 isWallhit = mChkObj.m_flags & dBgS_Acch::WALL_HIT;
|
||||
bool isGroundHit = mChkObj.ChkGroundHit() != 0;
|
||||
bool isWaterHit = mChkObj.ChkWaterHit() != 0;
|
||||
bool isWaterIn = mChkObj.ChkWaterIn() != 0;
|
||||
bool isGroundLanding = mChkObj.ChkGroundLanding();
|
||||
u32 isWallhit = mChkObj.ChkWallHit();
|
||||
bool isGroundHit = mChkObj.ChkGroundHit();
|
||||
bool isWaterHit = mChkObj.ChkWaterHit();
|
||||
bool isWaterIn = mChkObj.ChkWaterIn();
|
||||
if (field_0x0907 == 1) {
|
||||
if (isGroundLanding && !isWaterIn) {
|
||||
speed.x = speedF * cM_ssin(current.angle.y);
|
||||
@@ -336,7 +336,7 @@ void daObjStone_c::mode_proc_call() {
|
||||
speedF = speed.absXZ();
|
||||
current.angle.y = cM_atan2s(speed.x, speed.z);
|
||||
} else {
|
||||
if (isWallhit && field_0x0951 == 0 && isWaterIn) {
|
||||
if (isWallhit && !field_0x0951 && isWaterIn) {
|
||||
speed.x = speedF * cM_ssin(current.angle.y);
|
||||
speed.z = speedF * cM_scos(current.angle.y);
|
||||
speed.y = mLastSpeedY;
|
||||
@@ -489,7 +489,7 @@ void daObjStone_c::mode_proc_call() {
|
||||
}
|
||||
(this->*(l_func[field_0x0907]))();
|
||||
CrrPos();
|
||||
field_0x0951 = isWallhit != 0;
|
||||
field_0x0951 = isWallhit;
|
||||
}
|
||||
|
||||
void daObjStone_c::init_modePutWait() {
|
||||
@@ -1022,7 +1022,7 @@ static actor_method_class l_daObjStone_Method = {
|
||||
(process_method_func)daObjStone_Draw,
|
||||
};
|
||||
|
||||
extern actor_process_profile_definition g_profile_Obj_Stone = {
|
||||
actor_process_profile_definition g_profile_Obj_Stone = {
|
||||
fpcLy_CURRENT_e, // mLayerID
|
||||
8, // mListID
|
||||
fpcPi_CURRENT_e, // mListPrio
|
||||
|
||||
Reference in New Issue
Block a user