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

fgsfdsfgs · web-flow · commit 4bcfeddca7b6 · 2025-12-04T18:20:39.000+01:00
Limit 'Start Armed' option to Combat Simulator
diff --git 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
@@ -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) {

Original file line number	Diff line number	Diff line change
`@@ -1114,7 +1114,8 @@ void playerSpawn(void)`
`1114`	`1114`	`invGiveSingleWeapon(WEAPON_NIGHTVISION);`
`1115`	`1115`	`}`
`1116`	`1116`
`1117`		`- if ((g_MpSetup.options & MPOPTION_SPAWNWITHWEAPON)`
	`1117`	`+ if (g_Vars.normmplayerisrunning`
	`1118`	`+ && (g_MpSetup.options & MPOPTION_SPAWNWITHWEAPON)`
`1118`	`1119`	`&& g_MpSetup.weapons[0] != MPWEAPON_NONE`
`1119`	`1120`	`&& g_MpSetup.weapons[0] != MPWEAPON_DISABLED`
`1120`	`1121`	`&& g_MpSetup.weapons[0] != MPWEAPON_SHIELD) {`