Limit 'Start Armed' option to Combat Simulator

This commit is contained in:
Matthew Coppola committed 2025-12-03 19:35:24 -05:00
1 parent 7f68c46959
commit 6b0c4a11e2
2 files changed
+4 -2

No files matched your search

+2 -1
View File
@@ -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) {
+2 -1
View File
@@ -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) {