From 6e3c4dbc346d336c7d1e65e7371f0eca51bb439c Mon Sep 17 00:00:00 2001 From: Sally Coolatta Date: Mon, 23 May 2022 13:40:51 -0400 Subject: [PATCH] > numfollowers-1 -> >= numfollowers --- src/d_netcmd.c | 2 +- src/k_follower.c | 2 +- src/m_menu.c | 18 +++++++++--------- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/d_netcmd.c b/src/d_netcmd.c index 8d66a27bc..21d28ddc6 100644 --- a/src/d_netcmd.c +++ b/src/d_netcmd.c @@ -1422,7 +1422,7 @@ static void SendNameAndColor(UINT8 n) CV_StealthSet(&cv_followercolor[n], "Match"); // set it to "Match". I don't care about your stupidity! // so like, this is sent before we even use anything like cvars or w/e so it's possible that follower is set to a pretty yikes value, so let's fix that before we send garbage that could crash the game: - if (cv_follower[n].value > numfollowers-1 || cv_follower[n].value < -1) + if (cv_follower[n].value >= numfollowers || cv_follower[n].value < -1) CV_StealthSet(&cv_follower[n], "-1"); if (!strcmp(cv_playername[n].string, player_names[playernum]) diff --git a/src/k_follower.c b/src/k_follower.c index 4d7556dd4..532adbe24 100644 --- a/src/k_follower.c +++ b/src/k_follower.c @@ -201,7 +201,7 @@ void K_HandleFollower(player_t *player) } // How about making sure our follower exists and is added before trying to spawn it n' all? - if (player->followerskin > numfollowers-1 || player->followerskin < -1) + if (player->followerskin >= numfollowers || player->followerskin < -1) { //CONS_Printf("Follower skin invlaid. Setting to -1.\n"); player->followerskin = -1; diff --git a/src/m_menu.c b/src/m_menu.c index fcb2d6321..5d3aae841 100644 --- a/src/m_menu.c +++ b/src/m_menu.c @@ -9683,7 +9683,7 @@ static void M_DrawSetupMultiPlayerMenu(void) static void M_GetFollowerState(void) { - if (setupm_fakefollower <= -1 || setupm_fakefollower > numfollowers-1) // yikes, there's none! + if (setupm_fakefollower <= -1 || setupm_fakefollower >= numfollowers) // yikes, there's none! return; // ^ we don't actually need to set anything since it won't be displayed anyway. @@ -9831,13 +9831,13 @@ static void M_HandleSetupMultiPlayer(INT32 choice) // check followers: if (setupm_fakefollower < -1) { - setupm_fakefollower = numfollowers-1; - M_GetFollowerState(); // update follower state + setupm_fakefollower = numfollowers; + M_GetFollowerState(); // update follower state } - if (setupm_fakefollower > numfollowers-1) + if (setupm_fakefollower >= numfollowers) { setupm_fakefollower = -1; - M_GetFollowerState(); // update follower state + M_GetFollowerState(); // update follower state } // check color @@ -9879,7 +9879,7 @@ static void M_SetupMultiPlayer(INT32 choice) setupm_fakefollower = atoi(setupm_cvfollower->string); // update fake follower value // yikes, we don't want none of that... - if (setupm_fakefollower > numfollowers-1) + if (setupm_fakefollower >= numfollowers) setupm_fakefollower = -1; M_GetFollowerState(); // update follower state @@ -9922,7 +9922,7 @@ static void M_SetupMultiPlayer2(INT32 choice) setupm_fakefollower = atoi(setupm_cvfollower->string); // update fake follower value // yikes, we don't want none of that... - if (setupm_fakefollower > numfollowers-1) + if (setupm_fakefollower >= numfollowers) setupm_fakefollower = -1; M_GetFollowerState(); // update follower state @@ -9965,7 +9965,7 @@ static void M_SetupMultiPlayer3(INT32 choice) setupm_fakefollower = atoi(setupm_cvfollower->string); // update fake follower value // yikes, we don't want none of that... - if (setupm_fakefollower > numfollowers-1) + if (setupm_fakefollower >= numfollowers) setupm_fakefollower = -1; M_GetFollowerState(); // update follower state @@ -10008,7 +10008,7 @@ static void M_SetupMultiPlayer4(INT32 choice) setupm_fakefollower = atoi(setupm_cvfollower->string); // update fake follower value // yikes, we don't want none of that... - if (setupm_fakefollower > numfollowers-1) + if (setupm_fakefollower >= numfollowers) setupm_fakefollower = -1; M_GetFollowerState(); // update follower state