From 9179d0e2826ca144c3254fdec76c9c8240265eae Mon Sep 17 00:00:00 2001
From: SBH <49251833+RoseGunsDays@users.noreply.github.com>
Date: Mon, 16 Feb 2026 14:15:14 -0700
Subject: [PATCH] Change MJ4 touch panel functions to use GROUP_MJ4

---
 src/lindbergh/glutHooks.c | 2 +-
 src/lindbergh/hook.c      | 6 +++---
 src/lindbergh/sdlCalls.c  | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/lindbergh/glutHooks.c b/src/lindbergh/glutHooks.c
index d57376c..4b31750 100644
--- a/src/lindbergh/glutHooks.c
+++ b/src/lindbergh/glutHooks.c
@@ -106,7 +106,7 @@ void FGAPIENTRY glutSwapBuffers(void)
     sprintf(windowTitle, "%s - FPS: %.2f", sdlGameTitle, calculateFps());
     SDL_SetWindowTitle(sdlWindow, windowTitle);
 
-    if (gId == MJ4_REVG || gId == MJ4_EVO)
+    if (gGrp == GROUP_MJ4)
         mj4TouchHolding();
 }
 
diff --git a/src/lindbergh/hook.c b/src/lindbergh/hook.c
index c8af27e..84d4c42 100644
--- a/src/lindbergh/hook.c
+++ b/src/lindbergh/hook.c
@@ -1112,7 +1112,7 @@ ssize_t read(int fd, void *buf, size_t count)
             phRead(fd, buf, count);
             return 1;
         }
-        if ((gId == MJ4_EVO || gId == MJ4_REVG || gId == QUIZ_AXA || gId == QUIZ_AXA_LIVE) && getConfig()->emulateTouchscreen == 1 &&
+        if ((gGrp == GROUP_MJ4 || gId == QUIZ_AXA || gId == QUIZ_AXA_LIVE) && getConfig()->emulateTouchscreen == 1 &&
             mj4ResponseReady)
         {
             return mj4ReadTouchPacket(buf, count);
@@ -1293,7 +1293,7 @@ ssize_t write(int fd, const void *buf, size_t count)
             return driveboardWrite(fd, buf, count);
     }
 
-    if (fd == hooks[SERIAL1] && (gId == MJ4_EVO || gId == MJ4_REVG || gId == QUIZ_AXA || gId == QUIZ_AXA_LIVE))
+    if (fd == hooks[SERIAL1] && (gGrp == GROUP_MJ4 || gId == QUIZ_AXA || gId == QUIZ_AXA_LIVE))
     {
         return mj4WriteTouchPacket(buf, count);
     }
@@ -1336,7 +1336,7 @@ int ioctl(int fd, unsigned long int request, ...)
 
     if (fd == hooks[SERIAL0] || fd == hooks[SERIAL1])
     {
-        if (request == 0x541b && (gId == R_TUNED || gId == MJ4_REVG || gId == MJ4_EVO) && fd == hooks[SERIAL1])
+        if (request == 0x541b && (gId == R_TUNED || gGrp == GROUP_MJ4) && fd == hooks[SERIAL1])
         {
             uint8_t d = 1;
             memcpy(argp, &d, sizeof(uint8_t));
diff --git a/src/lindbergh/sdlCalls.c b/src/lindbergh/sdlCalls.c
index 02df3b9..2556969 100644
--- a/src/lindbergh/sdlCalls.c
+++ b/src/lindbergh/sdlCalls.c
@@ -222,7 +222,7 @@ void startSDL(int *argcp, char **argv)
           gId == GHOST_SQUAD_EVOLUTION || gId == PRIMEVAL_HUNT))
         initCrossHairs();
 
-    if ((gId == MJ4_REVG || gId == MJ4_EVO || gId == QUIZ_AXA || gId == QUIZ_AXA_LIVE) && strcmp(getConfig()->touchCursor, "") != 0 &&
+    if ((gGrp == GROUP_MJ4 || gId == QUIZ_AXA || gId == QUIZ_AXA_LIVE) && strcmp(getConfig()->touchCursor, "") != 0 &&
         getConfig()->emulateTouchscreen)
         setCursor(touchCursor);
     else if (getConfig()->hideCursor)