From c1e8cc108fda769bfa8a29e8d20ed89b0b3788b3 Mon Sep 17 00:00:00 2001 From: Sally Coolatta Date: Sat, 9 May 2020 22:32:56 -0400 Subject: [PATCH] Master Mode bots are functional --- src/k_grandprix.c | 44 +++++++++++++++++++++++++------------------- 1 file changed, 25 insertions(+), 19 deletions(-) diff --git a/src/k_grandprix.c b/src/k_grandprix.c index 708390f5a..da78cb332 100644 --- a/src/k_grandprix.c +++ b/src/k_grandprix.c @@ -42,7 +42,6 @@ void K_InitGrandPrixBots(void) UINT8 newplayernum = 0; UINT8 i, j; - memset(difficultylevels, MAXBOTDIFFICULTY, sizeof (difficultylevels)); memset(competitors, MAXPLAYERS, sizeof (competitors)); memset(botskinlist, defaultbotskin, sizeof (botskinlist)); @@ -63,24 +62,31 @@ void K_InitGrandPrixBots(void) I_Error("GP bot difficulty levels need rebalacned for the new player count!\n"); #endif - // init difficulty levels list - //if (!mastermodebots) { // leave as all level 9 - difficultylevels[0] = max(1, startingdifficulty); - difficultylevels[1] = max(1, startingdifficulty-1); - difficultylevels[2] = max(1, startingdifficulty-2); - difficultylevels[3] = max(1, startingdifficulty-3); - difficultylevels[4] = max(1, startingdifficulty-3); - difficultylevels[5] = max(1, startingdifficulty-4); - difficultylevels[6] = max(1, startingdifficulty-4); - difficultylevels[7] = max(1, startingdifficulty-4); - difficultylevels[8] = max(1, startingdifficulty-5); - difficultylevels[9] = max(1, startingdifficulty-5); - difficultylevels[10] = max(1, startingdifficulty-5); - difficultylevels[11] = max(1, startingdifficulty-6); - difficultylevels[12] = max(1, startingdifficulty-6); - difficultylevels[13] = max(1, startingdifficulty-6); - difficultylevels[14] = max(1, startingdifficulty-7); - difficultylevels[15] = max(1, startingdifficulty-7); + if (grandprixinfo.masterbots) + { + // Everyone is max difficulty!! + memset(difficultylevels, MAXBOTDIFFICULTY, sizeof (difficultylevels)); + } + else + { + // init difficulty levels list + difficultylevels[0] = max(1, startingdifficulty); + difficultylevels[1] = max(1, startingdifficulty-1); + difficultylevels[2] = max(1, startingdifficulty-2); + difficultylevels[3] = max(1, startingdifficulty-3); + difficultylevels[4] = max(1, startingdifficulty-3); + difficultylevels[5] = max(1, startingdifficulty-4); + difficultylevels[6] = max(1, startingdifficulty-4); + difficultylevels[7] = max(1, startingdifficulty-4); + difficultylevels[8] = max(1, startingdifficulty-5); + difficultylevels[9] = max(1, startingdifficulty-5); + difficultylevels[10] = max(1, startingdifficulty-5); + difficultylevels[11] = max(1, startingdifficulty-6); + difficultylevels[12] = max(1, startingdifficulty-6); + difficultylevels[13] = max(1, startingdifficulty-6); + difficultylevels[14] = max(1, startingdifficulty-7); + difficultylevels[15] = max(1, startingdifficulty-7); + } for (i = 0; i < MAXPLAYERS; i++) {