port: fix start armed mpoption

fgsfdsfgs · May 19, 2024 · 476093a · 476093a
1 parent dce96a4
commit 476093a
Show file tree

Hide file tree

Showing 10 changed files with 10 additions and 9 deletions.
diff --git a/src/game/bot.c b/src/game/bot.c
@@ -262,7 +262,7 @@ void botSpawn(struct chrdata *chr, u8 respawning)
 		func0f02e9a0(chr, 0);
 
 #ifndef PLATFORM_N64
-		if ((g_MpSetup.options & MPOPTION_SPAWNWITHWEAPON)
+		if (!(g_MpSetup.options & MPOPTION_STARTARMED)
 				&& g_MpSetup.weapons[0] != MPWEAPON_NONE
 				&& g_MpSetup.weapons[0] != MPWEAPON_DISABLED
 				&& g_MpSetup.weapons[0] != MPWEAPON_SHIELD) {

diff --git a/src/game/mplayer/mplayer.c b/src/game/mplayer/mplayer.c
@@ -539,6 +539,7 @@ void mpInit(void)
 		| MPOPTION_PAC_SHOWONRADAR;
 
 #ifndef PLATFORM_N64
+	g_MpSetup.options |= MPOPTION_STARTARMED;
 	g_MpSetup.options |= MPOPTION_FRIENDLYFIRE;
 #endif
 

diff --git a/src/game/mplayer/scenarios/capturethecase.inc b/src/game/mplayer/scenarios/capturethecase.inc
@@ -66,7 +66,7 @@ struct menuitem g_CtcOptionsMenuItems[] = {
 		0,
 		MENUITEMFLAG_LOCKABLEMINOR | MENUITEMFLAG_LITERAL_TEXT,
 		(uintptr_t)"Start Armed",
-		MPOPTION_SPAWNWITHWEAPON,
+		MPOPTION_STARTARMED,
 		menuhandlerMpCheckboxOption,
 	},
 	{

diff --git a/src/game/mplayer/scenarios/combat.inc b/src/game/mplayer/scenarios/combat.inc
@@ -61,7 +61,7 @@ struct menuitem g_MpCombatOptionsMenuItems[] = {
 		0,
 		MENUITEMFLAG_LOCKABLEMINOR | MENUITEMFLAG_LITERAL_TEXT,
 		(uintptr_t)"Start Armed",
-		MPOPTION_SPAWNWITHWEAPON,
+		MPOPTION_STARTARMED,
 		menuhandlerMpCheckboxOption,
 	},
 	{

diff --git a/src/game/mplayer/scenarios/hackthatmac.inc b/src/game/mplayer/scenarios/hackthatmac.inc
@@ -64,7 +64,7 @@ struct menuitem g_HtmOptionsMenuItems[] = {
 		0,
 		MENUITEMFLAG_LOCKABLEMINOR | MENUITEMFLAG_LITERAL_TEXT,
 		(uintptr_t)"Start Armed",
-		MPOPTION_SPAWNWITHWEAPON,
+		MPOPTION_STARTARMED,
 		menuhandlerMpCheckboxOption,
 	},
 	{

diff --git a/src/game/mplayer/scenarios/holdthebriefcase.inc b/src/game/mplayer/scenarios/holdthebriefcase.inc
@@ -64,7 +64,7 @@ struct menuitem g_HtbOptionsMenuItems[] = {
 		0,
 		MENUITEMFLAG_LOCKABLEMINOR | MENUITEMFLAG_LITERAL_TEXT,
 		(uintptr_t)"Start Armed",
-		MPOPTION_SPAWNWITHWEAPON,
+		MPOPTION_STARTARMED,
 		menuhandlerMpCheckboxOption,
 	},
 	{

diff --git a/src/game/mplayer/scenarios/kingofthehill.inc b/src/game/mplayer/scenarios/kingofthehill.inc
@@ -85,7 +85,7 @@ struct menuitem g_KohOptionsMenuItems[] = {
 		0,
 		MENUITEMFLAG_LOCKABLEMINOR | MENUITEMFLAG_LITERAL_TEXT,
 		(uintptr_t)"Start Armed",
-		MPOPTION_SPAWNWITHWEAPON,
+		MPOPTION_STARTARMED,
 		menuhandlerMpCheckboxOption,
 	},
 	{

diff --git a/src/game/mplayer/scenarios/popacap.inc b/src/game/mplayer/scenarios/popacap.inc
@@ -62,7 +62,7 @@ struct menuitem g_PacOptionsMenuItems[] = {
 		0,
 		MENUITEMFLAG_LOCKABLEMINOR | MENUITEMFLAG_LITERAL_TEXT,
 		(uintptr_t)"Start Armed",
-		MPOPTION_SPAWNWITHWEAPON,
+		MPOPTION_STARTARMED,
 		menuhandlerMpCheckboxOption,
 	},
 	{

diff --git a/src/game/player.c b/src/game/player.c
@@ -1104,7 +1104,7 @@ void playerSpawn(void)
 				invGiveSingleWeapon(WEAPON_NIGHTVISION);
 			}
 
-			if ((g_MpSetup.options & MPOPTION_SPAWNWITHWEAPON)
+			if (!(g_MpSetup.options & MPOPTION_STARTARMED)
 					&& g_MpSetup.weapons[0] != MPWEAPON_NONE
 					&& g_MpSetup.weapons[0] != MPWEAPON_DISABLED
 					&& g_MpSetup.weapons[0] != MPWEAPON_SHIELD) {

diff --git a/src/include/constants.h b/src/include/constants.h
@@ -2890,7 +2890,7 @@
 #define MPOPTION_HTM_SHOWONRADAR        0x00040000
 #define MPOPTION_PAC_HIGHLIGHTTARGET    0x00080000
 #define MPOPTION_PAC_SHOWONRADAR        0x00100000
-#define MPOPTION_SPAWNWITHWEAPON        0x00200000
+#define MPOPTION_STARTARMED             0x00200000
 #define MPOPTION_NODRUGBLUR             0x00400000
 #define MPOPTION_AUTORANDOMWEAPON_START 0x00800000
 #define MPOPTION_AUTORANDOMWEAPON_END   0x01000000