From dc5d14ea21191a0276d59c81a395ba7fbf1a85ff Mon Sep 17 00:00:00 2001 From: Ryan Dwyer Date: Thu, 6 Feb 2020 17:10:05 +1000 Subject: [PATCH] Rename g_Vars.mplayerisrunning properties --- src/game/cheats.c | 6 +++--- src/game/chr/chr.c | 6 +++--- src/game/chr/chraicommands.c | 2 +- src/game/game_011110.c | 6 +++--- src/game/game_012450.c | 2 +- src/game/game_0f09f0.c | 2 +- src/game/game_176d70.c | 10 +++++----- src/game/game_187770.c | 2 +- src/include/gvars/gvars.h | 4 ++-- src/library/library_15860.c | 2 +- 10 files changed, 21 insertions(+), 21 deletions(-) diff --git a/src/game/cheats.c b/src/game/cheats.c index 2a18fceb2..cd143f9b1 100644 --- a/src/game/cheats.c +++ b/src/game/cheats.c @@ -77,7 +77,7 @@ void cheatActivate(s32 cheat_id) break; case CHEAT_ALLGUNS: // Give all guns if only one player playing - if (PLAYERCOUNT() == 1 && g_Vars.mplayerisrunning == false) { + if (PLAYERCOUNT() == 1 && g_Vars.normmplayerisrunning == false) { prevplayernum = g_Vars.currentplayernum; for (playernum = 0; playernum < PLAYERCOUNT(); playernum++) { @@ -114,7 +114,7 @@ void cheatDeactivate(s32 cheat_id) setCurrentPlayerNum(prevplayernum); break; case CHEAT_ALLGUNS: - if (PLAYERCOUNT() == 1 && g_Vars.mplayerisrunning == false) { + if (PLAYERCOUNT() == 1 && g_Vars.normmplayerisrunning == false) { prevplayernum = g_Vars.currentplayernum; for (playernum = 0; playernum < PLAYERCOUNT(); playernum++) { @@ -150,7 +150,7 @@ void cheatsActivate(void) g_CheatsActiveBank0 = g_CheatsEnabledBank0; g_CheatsActiveBank1 = g_CheatsEnabledBank1; - if (g_Vars.coopplayernum >= 0 || g_Vars.antiplayernum >= 0 || g_Vars.mplayerisrunning) { + if (g_Vars.coopplayernum >= 0 || g_Vars.antiplayernum >= 0 || g_Vars.normmplayerisrunning) { // Co-op/counter-op/multi - deactivate "Weapons for Jo in Solo" cheats g_CheatsActiveBank0 &= ~( (1 << CHEAT_TRENTSMAGNUM) | diff --git a/src/game/chr/chr.c b/src/game/chr/chr.c index 7d2601512..5e4937ec8 100644 --- a/src/game/chr/chr.c +++ b/src/game/chr/chr.c @@ -30058,7 +30058,7 @@ glabel chrGoToPos // func0f037088(chr, &auStack52[0], &auStack68[0]); // // if ((!same2 || same) && -// g_Vars.mplayerisrunning == 0 && +// g_Vars.normmplayerisrunning == 0 && // (prop->flags & (PROPFLAG_80 | PROPFLAG_40 | PROPFLAG_02)) == 0 && // func0f036c08(chr, &auStack52[0], &auStack68[0]) && // chr->unk32c_00 >= 0) { @@ -49733,7 +49733,7 @@ bool chrCompareTeams(struct chrdata *chr1, struct chrdata *chr2, u8 checktype) } if (checktype == 1) { // Return true if chrs are friends - if (g_Vars.mplayerisrunning) { + if (g_Vars.normmplayerisrunning) { if ((g_MpSetup.options & MPOPTION_TEAMSENABLED) && chr2->team == chr1->team) { return true; } @@ -49753,7 +49753,7 @@ bool chrCompareTeams(struct chrdata *chr1, struct chrdata *chr2, u8 checktype) } } } else if (checktype == 2) { // Return true if chrs are enemies - if (g_Vars.mplayerisrunning) { + if (g_Vars.normmplayerisrunning) { if ((g_MpSetup.options & MPOPTION_TEAMSENABLED) == 0 || chr2->team != chr1->team) { return true; } diff --git a/src/game/chr/chraicommands.c b/src/game/chr/chraicommands.c index b157d6cec..d78da6429 100644 --- a/src/game/chr/chraicommands.c +++ b/src/game/chr/chraicommands.c @@ -14193,7 +14193,7 @@ glabel ai01dd */ bool aiIfCoopMode(void) { - if (g_Vars.mplayerisrunning == false && g_MissionConfig.iscoop) { + if (g_Vars.normmplayerisrunning == false && g_MissionConfig.iscoop) { u8 *cmd = g_Vars.ailist + g_Vars.aioffset; g_Vars.aioffset = chraiGoToLabel(g_Vars.ailist, g_Vars.aioffset, cmd[2]); } else { diff --git a/src/game/game_011110.c b/src/game/game_011110.c index 15c355cf9..7af16a597 100644 --- a/src/game/game_011110.c +++ b/src/game/game_011110.c @@ -1519,7 +1519,7 @@ glabel currentPlayerInit // g_Vars.currentplayer->prop->chr->team = TEAM_ENEMY; // } // } else { -// if (g_Vars.unk000314) { +// if (g_Vars.mplayerisrunning) { // g_Vars.currentplayer->prop->chr->team = 1 << g_MpPlayers[g_Vars.unk000288->mpchrnum].base.team; // } else { // g_Vars.currentplayer->prop->chr->team = TEAM_ALLY; @@ -1536,7 +1536,7 @@ glabel currentPlayerInit // } else if (g_Vars.antiplayernum >= 0) { // fStack32 = M_PI * 2 - scenarioCallback2c(30, &pos, &rooms[0], g_Vars.currentplayer->prop); // } else { -// if (g_Vars.unk000314 == 0) { +// if (g_Vars.mplayerisrunning == 0) { // g_NumSpawnPoints = 1; // } // @@ -1580,7 +1580,7 @@ glabel currentPlayerInit // // func0f0cb8c4(g_Vars.currentplayer); // -// if (g_Vars.mplayerisrunning) { +// if (g_Vars.normmplayerisrunning) { // func0f0b9674(); // } else { // func0f0b9a20(); diff --git a/src/game/game_012450.c b/src/game/game_012450.c index 0ac59a102..f8ecd1764 100644 --- a/src/game/game_012450.c +++ b/src/game/game_012450.c @@ -16,7 +16,7 @@ void currentPlayerInitGunsHeld(void) { s32 i; - if (PLAYERCOUNT() == 1 && g_Vars.mplayerisrunning == false) { + if (PLAYERCOUNT() == 1 && g_Vars.normmplayerisrunning == false) { g_Vars.currentplayer->equipallguns = cheatIsActive(CHEAT_ALLGUNS); } else { g_Vars.currentplayer->equipallguns = false; diff --git a/src/game/game_0f09f0.c b/src/game/game_0f09f0.c index b4d16fa8a..1b0d33270 100644 --- a/src/game/game_0f09f0.c +++ b/src/game/game_0f09f0.c @@ -16335,7 +16335,7 @@ void activemenuChangeScreen(s32 step) g_ActiveMenuThings[g_ActiveMenuIndex].screenindex += step; - if (g_Vars.mplayerisrunning && (g_MpSetup.options & MPOPTION_TEAMSENABLED)) { + if (g_Vars.normmplayerisrunning && (g_MpSetup.options & MPOPTION_TEAMSENABLED)) { if (g_ActiveMenuThings[g_ActiveMenuIndex].unk32) { // Weapon selection, second function, and ...? maxscreenindex = 2; diff --git a/src/game/game_176d70.c b/src/game/game_176d70.c index 023e5ebd1..eebe31a34 100644 --- a/src/game/game_176d70.c +++ b/src/game/game_176d70.c @@ -14672,7 +14672,7 @@ glabel func0f185568 void scenarioCallback10(void) { - if (g_Vars.mplayerisrunning) { + if (g_Vars.normmplayerisrunning) { if (g_Vars.lvframenum == 5) { func0f185568(); } @@ -14685,7 +14685,7 @@ void scenarioCallback10(void) void scenarioCallback14(struct chrdata *chr) { - if (g_Vars.mplayerisrunning && g_MpScenarios[g_MpSetup.scenario].unk14) { + if (g_Vars.normmplayerisrunning && g_MpScenarios[g_MpSetup.scenario].unk14) { g_MpScenarios[g_MpSetup.scenario].unk14(chr); } } @@ -15099,7 +15099,7 @@ glabel func0f185c14 s32 scenarioRadar(s32 value) { - if (g_Vars.mplayerisrunning && g_MpScenarios[g_MpSetup.scenario].radarfunc) { + if (g_Vars.normmplayerisrunning && g_MpScenarios[g_MpSetup.scenario].radarfunc) { return g_MpScenarios[g_MpSetup.scenario].radarfunc(value); } @@ -15108,7 +15108,7 @@ s32 scenarioRadar(s32 value) bool scenarioRadar2(s32 *displaylist, struct prop *prop) { - if (g_Vars.mplayerisrunning && g_MpScenarios[g_MpSetup.scenario].radar2func) { + if (g_Vars.normmplayerisrunning && g_MpScenarios[g_MpSetup.scenario].radar2func) { return g_MpScenarios[g_MpSetup.scenario].radar2func(displaylist, prop); } @@ -15352,7 +15352,7 @@ f32 scenarioCallback2c(f32 arg0, struct coord *pos, s16 *arg2, struct prop *prop { f32 result; - if (g_Vars.mplayerisrunning && g_MpScenarios[g_MpSetup.scenario].unk2c && + if (g_Vars.normmplayerisrunning && g_MpScenarios[g_MpSetup.scenario].unk2c && g_MpScenarios[g_MpSetup.scenario].unk2c(arg0, pos, arg2, prop, &result)) { return result; } diff --git a/src/game/game_187770.c b/src/game/game_187770.c index 414e62f82..0da57bee9 100644 --- a/src/game/game_187770.c +++ b/src/game/game_187770.c @@ -2513,7 +2513,7 @@ glabel func0f18961c bool mpIsPaused(void) { - if (PLAYERCOUNT() == 1 && g_Vars.unk000314 && g_MenuStack[g_Vars.unk000288->mpchrnum].unk00) { + if (PLAYERCOUNT() == 1 && g_Vars.mplayerisrunning && g_MenuStack[g_Vars.unk000288->mpchrnum].unk00) { return true; } diff --git a/src/include/gvars/gvars.h b/src/include/gvars/gvars.h index 5e43c353f..6e819b56a 100644 --- a/src/include/gvars/gvars.h +++ b/src/include/gvars/gvars.h @@ -78,8 +78,8 @@ struct g_vars { /*000308*/ u32 unk000308; /*00030c*/ u32 unk00030c; /*000310*/ u32 unk000310; - /*000314*/ u32 unk000314; - /*000318*/ bool mplayerisrunning; + /*000314*/ bool mplayerisrunning; + /*000318*/ bool normmplayerisrunning; /*00031c*/ u32 unk00031c; /*000320*/ u32 unk000320; /*000324*/ s32 unk000324; diff --git a/src/library/library_15860.c b/src/library/library_15860.c index 8a9a20f2a..c4cde136e 100644 --- a/src/library/library_15860.c +++ b/src/library/library_15860.c @@ -40,8 +40,8 @@ void initGlobalVariables(void) g_Vars.unk000328 = 1; g_Vars.tickmode = TICKMODE_0; g_Vars.roomcount = 350; - g_Vars.unk000314 = 0; g_Vars.mplayerisrunning = 0; + g_Vars.normmplayerisrunning = 0; g_Vars.perfectbuddynum = 0; g_Vars.unk00032c = 0; g_Vars.restartlevel = 0;