From 24b0c3afd601ee40772b5bff51fb69b4efda10c2 Mon Sep 17 00:00:00 2001 From: Sally Coolatta Date: Wed, 13 May 2020 02:17:52 -0400 Subject: [PATCH] Use skinname for default bot --- src/k_grandprix.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/k_grandprix.c b/src/k_grandprix.c index f54055598..77bdf723c 100644 --- a/src/k_grandprix.c +++ b/src/k_grandprix.c @@ -23,7 +23,8 @@ struct grandprixinfo grandprixinfo; void K_InitGrandPrixBots(void) { - const UINT8 defaultbotskin = 9; // eggrobo + const char *defaultbotskinname = "eggrobo"; + SINT8 defaultbotskin = R_SkinAvailable(defaultbotskinname); // startingdifficulty: Easy = 3, Normal = 6, Hard = 9 const UINT8 startingdifficulty = min(MAXBOTDIFFICULTY, (gamespeed + 1) * 3); @@ -42,6 +43,12 @@ void K_InitGrandPrixBots(void) UINT8 newplayernum = 0; UINT8 i, j; + if (defaultbotskin == -1) + { + // This shouldn't happen, but just in case + defaultbotskin = 0; + } + memset(competitors, MAXPLAYERS, sizeof (competitors)); memset(botskinlist, defaultbotskin, sizeof (botskinlist));