popux/perfect_dark
1
0 Fork 0
forked from Ports/perfect_dark
Code Pull Requests Activity

Use already existing JPN fix

Browse Source
This commit is contained in:
tmyqlfpir authored and GitHub committed 2023-08-20 23:19:59 +10:00
1 parent 47d4e4f659
commit ec09d4a6ca
2 files changed
+2 -6
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/game/activemenu.c
-4
View File
@@ -609,9 +609,6 @@ void amChangeScreen(s32 step)
if (g_AmMenus[g_AmIndex].allbots) { if (g_AmMenus[g_AmIndex].allbots) {
// Weapon selection, second function, and bot command menu // Weapon selection, second function, and bot command menu
#ifndef PLATFORM_N64 // fix for port
maxscreenindex = g_Vars.currentplayer->numaibuddies > 0 ? 2 : 1;
#else
// @bug: This is missing a check to see if there are any bots on // @bug: This is missing a check to see if there are any bots on
// your team. In most cases this isn't a problem because the player // your team. In most cases this isn't a problem because the player
// opens the screen for a single bot then uses R to switch to all // opens the screen for a single bot then uses R to switch to all
@@ -621,7 +618,6 @@ void amChangeScreen(s32 step)
// part runs first and sets the screen index to an invalid value, // part runs first and sets the screen index to an invalid value,
// causing a crash. // causing a crash.
maxscreenindex = 2; maxscreenindex = 2;
#endif
} else { } else {
// Weapon selection, second function and one for each AI buddy // Weapon selection, second function and one for each AI buddy
maxscreenindex = g_Vars.currentplayer->numaibuddies + 1; maxscreenindex = g_Vars.currentplayer->numaibuddies + 1;
src/game/activemenutick.c
+2 -2
View File
@@ -77,7 +77,7 @@ void amTick(void)
} }
if (buttonsstate & A_BUTTON) { if (buttonsstate & A_BUTTON) {
#if VERSION >= VERSION_JPN_FINAL #if VERSION >= VERSION_JPN_FINAL || !defined(PLATFORM_N64)
if (g_Vars.currentplayer->numaibuddies > 0) { if (g_Vars.currentplayer->numaibuddies > 0) {
g_AmMenus[g_AmIndex].allbots = true; g_AmMenus[g_AmIndex].allbots = true;
} }
@@ -91,7 +91,7 @@ void amTick(void)
} }
if ((buttonsstate & R_TRIG) || (buttonsstate & L_TRIG)) { if ((buttonsstate & R_TRIG) || (buttonsstate & L_TRIG)) {
#if VERSION >= VERSION_JPN_FINAL #if VERSION >= VERSION_JPN_FINAL || !defined(PLATFORM_N64)
if (g_Vars.currentplayer->numaibuddies > 0) { if (g_Vars.currentplayer->numaibuddies > 0) {
g_AmMenus[g_AmIndex].allbots = true; g_AmMenus[g_AmIndex].allbots = true;
} }