From 6b0c4a11e25806575c585e7a3b08dd10fc373f2d Mon Sep 17 00:00:00 2001 From: Matthew Coppola Date: Wed, 3 Dec 2025 19:33:30 -0500 Subject: [PATCH] Limit 'Start Armed' option to Combat Simulator --- src/game/bot.c | 3 ++- src/game/player.c | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/game/bot.c b/src/game/bot.c index 3f4334d59..cb20c4176 100644 --- a/src/game/bot.c +++ b/src/game/bot.c @@ -262,7 +262,8 @@ void botSpawn(struct chrdata *chr, u8 respawning) func0f02e9a0(chr, 0); #ifndef PLATFORM_N64 - if ((g_MpSetup.options & MPOPTION_SPAWNWITHWEAPON) + if (g_Vars.normmplayerisrunning + && (g_MpSetup.options & MPOPTION_SPAWNWITHWEAPON) && g_MpSetup.weapons[0] != MPWEAPON_NONE && g_MpSetup.weapons[0] != MPWEAPON_DISABLED && g_MpSetup.weapons[0] != MPWEAPON_SHIELD) { diff --git a/src/game/player.c b/src/game/player.c index cd5fe4137..16a6d25f1 100644 --- a/src/game/player.c +++ b/src/game/player.c @@ -1114,7 +1114,8 @@ void playerSpawn(void) invGiveSingleWeapon(WEAPON_NIGHTVISION); } - if ((g_MpSetup.options & MPOPTION_SPAWNWITHWEAPON) + if (g_Vars.normmplayerisrunning + && (g_MpSetup.options & MPOPTION_SPAWNWITHWEAPON) && g_MpSetup.weapons[0] != MPWEAPON_NONE && g_MpSetup.weapons[0] != MPWEAPON_DISABLED && g_MpSetup.weapons[0] != MPWEAPON_SHIELD) {