falso
/
perfect_dark
mirror of https://github.com/n64decomp/perfect_dark.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use already existing JPN fix

This commit is contained in:
tmyqlfpir 2023-08-20 23:19:59 +10:00 committed by GitHub
parent 47d4e4f659
commit ec09d4a6ca
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/game/activemenu.c
View File

@ -609,9 +609,6 @@ void amChangeScreen(s32 step)
if (g_AmMenus[g_AmIndex].allbots) {
// 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
// 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
@ -621,7 +618,6 @@ void amChangeScreen(s32 step)
// part runs first and sets the screen index to an invalid value,
// causing a crash.
maxscreenindex = 2;
#endif
} else {
// Weapon selection, second function and one for each AI buddy
maxscreenindex = g_Vars.currentplayer->numaibuddies + 1;

4
src/game/activemenutick.c
View File

@ -77,7 +77,7 @@ void amTick(void)
}
if (buttonsstate & A_BUTTON) {
#if VERSION >= VERSION_JPN_FINAL
#if VERSION >= VERSION_JPN_FINAL || !defined(PLATFORM_N64)
if (g_Vars.currentplayer->numaibuddies > 0) {
g_AmMenus[g_AmIndex].allbots = true;
}
@ -91,7 +91,7 @@ void amTick(void)
}
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) {
g_AmMenus[g_AmIndex].allbots = true;
}