mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-07-31 15:47:17 -04:00
Code Issues Packages Projects Releases Wiki Activity

Clean up code, remove fakematches, add UNUSED, enable warnings (#2992)

Browse Source 
* 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:
LagoLunatic
2025-12-23 18:53:10 -05:00
committed by GitHub
parent 6ef13c620a
commit 877889c510
887 changed files with 1174 additions and 1727 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/f_op/f_op_actor.cpp
+17 -17
View File
@@ -110,7 +110,7 @@ void print_error_check_c::check() {
}
if (mPrintErrors != print_errors) {
static char l_name[8];
static char l_name[dStage_NAME_LENGTH];
fopAcM_getNameString(mpActor, l_name);
OS_REPORT("\x1b[36m↑%s_SUBMETHOD %08x %08x %s %s\n\x1b[m",
mName, mpActor, mpActor->base.base.name, fpcDbSv_getNameString(mpActor->base.base.name), l_name);
@@ -119,7 +119,7 @@ void print_error_check_c::check() {
if (mThresholdEnable) {
OSTick tick_diff = tick - mTick;
if (mTimeMs != 0 && tick_diff > OSMicrosecondsToTicks(mTimeMs)) {
static char l_name[8];
static char l_name[dStage_NAME_LENGTH];
fopAcM_getNameString(mpActor, l_name);
OSReport_Warning("%s_SUBMETHOD 処理時間ながすぎ %4d us [%s] %s\n",
mName, OSTicksToMicroseconds(tick_diff), fpcDbSv_getNameString(mpActor->base.base.name), l_name);
@@ -219,7 +219,7 @@ static int fopAc_Draw(void* i_this) {
fapGm_HIO_c::startCpuTimer();
if (mDoCPd_c::getTrigB(PAD_1) && l_HIO.mBBtnInfoDisp) {
static char l_name[8];
static char l_name[dStage_NAME_LENGTH];
fopAcM_getNameString(actor, l_name);
OSReport("%7s %3d %5d x %10.2f y %10.2f z %10.2f\n",
@@ -228,7 +228,7 @@ static int fopAc_Draw(void* i_this) {
if (l_HIO.mActorNum == fopAcM_GetName(actor) && l_HIO.mStopDraw) {
if (l_HIO.field_0x8 != l_HIO.mStopDraw) {
static char l_name[8];
static char l_name[dStage_NAME_LENGTH];
fopAcM_getNameString(actor, l_name);
OSReport("<%s> の描画を停止します\n", l_name);
}
@@ -271,11 +271,11 @@ static int fopAc_Draw(void* i_this) {
}
#if DEBUG
char sp38[40];
char sp10[8];
fopAcM_getNameString(actor, sp10);
sprintf(sp38, "%s（描画処理）", sp10);
fapGm_HIO_c::stopCpuTimer(sp38);
char message[40];
char name[dStage_NAME_LENGTH];
fopAcM_getNameString(actor, name);
sprintf(message, "%s（描画処理）", name);
fapGm_HIO_c::stopCpuTimer(message);
#endif
return ret;
@@ -290,7 +290,7 @@ static int fopAc_Execute(void* i_this) {
if (l_HIO.mActorNum == fopAcM_GetName(actor) && l_HIO.mStopExecute) {
if (l_HIO.field_0x7 != l_HIO.mStopExecute) {
static char l_name[8];
static char l_name[dStage_NAME_LENGTH];
fopAcM_getNameString(actor, l_name);
OSReport("<%s> の処理を停止します\n", l_name);
}
@@ -307,7 +307,7 @@ static int fopAc_Execute(void* i_this) {
if (!(-1.0e32f < actor->current.pos.x && actor->current.pos.x < 1.0e32f && -1.0e32f < actor->current.pos.y && actor->current.pos.y < 1.0e32f && -1.0e32f < actor->current.pos.z && actor->current.pos.z < 1.0e32f))
{
static char l_name[8];
static char l_name[dStage_NAME_LENGTH];
fopAcM_getNameString(actor, l_name);
OSReport("！！！<%s> が範囲外にいます！！！\n", l_name);
}
@@ -366,11 +366,11 @@ static int fopAc_Execute(void* i_this) {
}
#if DEBUG
char sp38[40];
char sp10[8];
fopAcM_getNameString(actor, sp10);
sprintf(sp38, "%s（計算処理）", sp10);
fapGm_HIO_c::stopCpuTimer(sp38);
char message[40];
char name[dStage_NAME_LENGTH];
fopAcM_getNameString(actor, name);
sprintf(message, "%s（計算処理）", name);
fapGm_HIO_c::stopCpuTimer(message);
#endif
return ret;
@@ -629,7 +629,7 @@ void fopEn_enemy_c::drawBallModel(dKy_tevstr_c* i_tevstr) {
}
}
extern actor_method_class g_fopAc_Method = {
actor_method_class g_fopAc_Method = {
(process_method_func)fopAc_Create, (process_method_func)fopAc_Delete,
(process_method_func)fopAc_Execute, (process_method_func)fopAc_IsDelete,
(process_method_func)fopAc_Draw,
src/f_op/f_op_actor_mng.cpp
+5
View File
@@ -2016,4 +2016,9 @@ bool fopAcM_wt_c::waterCheck(cXyz const* i_pos) {
return false;
}
BOOL fopAcM_getNameString(const fopAc_ac_c* i_actor, char* o_name) {
strcpy(o_name, dStage_getName(fopAcM_GetProfName(i_actor), i_actor->argument));
return TRUE;
}
void fopAcM_initManager() {}
src/f_op/f_op_scene.cpp
+4 -4
View File
@@ -11,16 +11,16 @@ static int fopScn_Draw(scene_class* i_this) {
}
static int fopScn_Execute(scene_class* i_this) {
return fpcMtd_Execute(i_this->submethod, i_this);
return fpcMtd_Execute((process_method_class*)i_this->submethod, i_this);
}
static int fopScn_IsDelete(void* i_this) {
return fpcMtd_IsDelete(static_cast<scene_class*>(i_this)->submethod, i_this);
return fpcMtd_IsDelete((process_method_class*)static_cast<scene_class*>(i_this)->submethod, i_this);
}
static int fopScn_Delete(void* i_this) {
scene_class* scene = (scene_class*)i_this;
int ret = fpcMtd_Delete(scene->submethod, scene);
int ret = fpcMtd_Delete((process_method_class*)scene->submethod, scene);
if (ret == 1) {
fopScnTg_QueueTo(&scene->scene_tag);
}
@@ -42,7 +42,7 @@ static int fopScn_Create(void* i_this) {
}
}
return fpcMtd_Create(scene->submethod, i_this);
return fpcMtd_Create((process_method_class*)scene->submethod, i_this);
}
leafdraw_method_class g_fopScn_Method = {