Change MJ4 touch panel functions to use GROUP_MJ4

This commit is contained in:
SBH
2026-02-16 14:15:14 -07:00
parent d5e370240c
commit 9179d0e282
3 changed files with 5 additions and 5 deletions
+1 -1
View File
@@ -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();
}
+3 -3
View File
@@ -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));
+1 -1
View File
@@ -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)