From 382c0aa7de42b38e647bdfd3b157ff239d1bb5fc Mon Sep 17 00:00:00 2001
From: Sally Coolatta <tehrealsalt@gmail.com>
Date: Sun, 25 Apr 2021 16:27:15 -0400
Subject: [PATCH] Fix overshadowed declaration
---
src/m_menu.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/m_menu.c b/src/m_menu.c
index 651dbecc6d..eb330c9e9c 100644
--- a/src/m_menu.c
+++ b/src/m_menu.c
@@ -8963,7 +8963,7 @@ static void M_CacheCharacterSelectEntry(INT32 i, INT32 skinnum)
static UINT8 M_SetupChoosePlayerDirect(INT32 choice)
{
- INT32 skinnum, botskin;
+ INT32 skinnum, botskinnum;
UINT8 i;
UINT8 firstvalid = 255, lastvalid = 255;
boolean allowed = false;
@@ -8995,8 +8995,8 @@ static UINT8 M_SetupChoosePlayerDirect(INT32 choice)
skinnum = description[i].skinnum[0];
if ((skinnum != -1) && (R_SkinUsable(-1, skinnum)))
{
- botskin = description[i].skinnum[1];
- if ((botskin != -1) && (!R_SkinUsable(-1, botskin)))
+ botskinnum = description[i].skinnum[1];
+ if ((botskinnum != -1) && (!R_SkinUsable(-1, botskinnum)))
{
// Bot skin isn't unlocked
continue;
--
GitLab