Merge pull request #674 from ZenithMDC/limit-start-armed-to-csim

Limit 'Start Armed' option to Combat Simulator
This commit is contained in:
fgsfds authored and GitHub committed 2025-12-04 18:20:39 +01:00
commit 4bcfeddca7
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) {