summaryrefslogtreecommitdiff
path: root/src/d/d_menu_fmap.cpp
diff options
context:
space:
mode:
authorLagoLunatic <LagoLunatic@users.noreply.github.com>2025-12-23 18:53:10 -0500
committerGitHub <noreply@github.com>2025-12-23 15:53:10 -0800
commit877889c5105e59ee3aa4e57e53d3b0c5ffcfca77 (patch)
tree154eddaea39971210e088cb828f80d38b998f998 /src/d/d_menu_fmap.cpp
parent6ef13c620a46aed5fea525699a4832a1ad6e4d1f (diff)
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
Diffstat (limited to 'src/d/d_menu_fmap.cpp')
-rw-r--r--src/d/d_menu_fmap.cpp5
1 files changed, 1 insertions, 4 deletions
diff --git a/src/d/d_menu_fmap.cpp b/src/d/d_menu_fmap.cpp
index bfe946f726..649df3039f 100644
--- a/src/d/d_menu_fmap.cpp
+++ b/src/d/d_menu_fmap.cpp
@@ -1383,12 +1383,9 @@ void dMenu_Fmap_c::portal_demo5_init() {
void dMenu_Fmap_c::portal_demo5_move() {
mpStick->checkTrigger();
- // fakematch: the call to the fake inline function dMeter2Info_isTouchKeyCheck_alt
- // should actually call dMeter2Info_isTouchKeyCheck, but for some reason the generated asm
- // is different from every other call to dMeter2Info_isTouchKeyCheck
if (dMw_B_TRIGGER() || dMw_Z_TRIGGER() || dMw_START_TRIGGER() || dMw_UP_TRIGGER()
|| dMw_DOWN_TRIGGER() || dMw_LEFT_TRIGGER() || dMw_RIGHT_TRIGGER()
- || dMeter2Info_isTouchKeyCheck_alt(0xc))
+ || dMeter2Info_isTouchKeyCheck(0xc))
{
dMsgObject_setTalkHeap(mpTalkHeap);
fopMsgM_messageSet(2015, 1000);