From 7e8c57ee4d82359da6da0d3b8e7b65c2d3440387 Mon Sep 17 00:00:00 2001
From: tmyqlfpir <80724828+tmyqlfpir@users.noreply.github.com>
Date: Fri, 8 Sep 2023 20:25:30 +1000
Subject: [PATCH] Fix random five scenario using classic weapons for last slot

---
 src/game/mplayer/mplayer.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/game/mplayer/mplayer.c b/src/game/mplayer/mplayer.c
index 3ad293e9f..83cf94d61 100644
--- a/src/game/mplayer/mplayer.c
+++ b/src/game/mplayer/mplayer.c
@@ -1154,7 +1154,11 @@ void mpApplyWeaponSet(void)
 			mpSetWeaponSlot(i, random() % numoptions + 1);
 		}
 
+#ifndef PLATFORM_N64 // take into account the new classic weapons slots
+		mpSetWeaponSlot(i, MPWEAPON_DISABLED - 1);
+#else
 		mpSetWeaponSlot(i, mpGetNumWeaponOptions() - 1);
+#endif
 	}
 }