Ports/perfect_dark
1
0 Fork 1
mirror of https://github.com/perfect-dark-pc-port/perfect_dark.git synced 2026-10-23 15:52:41 +02:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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
2 parents 7f68c46959 6b0c4a11e2
commit 4bcfeddca7
2 files changed
+4 -2
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/game/bot.c
+2 -1
View File
@@ -262,7 +262,8 @@ void botSpawn(struct chrdata *chr, u8 respawning)
func0f02e9a0(chr, 0); func0f02e9a0(chr, 0);
#ifndef PLATFORM_N64 #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_NONE
&& g_MpSetup.weapons[0] != MPWEAPON_DISABLED && g_MpSetup.weapons[0] != MPWEAPON_DISABLED
&& g_MpSetup.weapons[0] != MPWEAPON_SHIELD) { && g_MpSetup.weapons[0] != MPWEAPON_SHIELD) {
src/game/player.c
+2 -1
View File
@@ -1114,7 +1114,8 @@ void playerSpawn(void)
invGiveSingleWeapon(WEAPON_NIGHTVISION); 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_NONE
&& g_MpSetup.weapons[0] != MPWEAPON_DISABLED && g_MpSetup.weapons[0] != MPWEAPON_DISABLED
&& g_MpSetup.weapons[0] != MPWEAPON_SHIELD) { && g_MpSetup.weapons[0] != MPWEAPON_SHIELD) {