port: add friendly fire mp option

fgsfdsfgs · Mar 19, 2024 · 0b61ec9 · 0b61ec9
1 parent c9f880e
commit 0b61ec9
Show file tree

Hide file tree

Showing 9 changed files with 65 additions and 0 deletions.
diff --git a/src/game/chraction.c b/src/game/chraction.c
@@ -4339,6 +4339,18 @@ void chrDamage(struct chrdata *chr, f32 damage, struct coord *vector, struct gse
 		return;
 	}
 
+#ifndef PLATFORM_N64
+	// Don't damage if multiplayer and friendly fire is off
+	if (g_Vars.mplayerisrunning
+			&& !(g_MpSetup.options & MPOPTION_FRIENDLYFIRE)
+			&& aprop
+			&& aprop != vprop
+			&& (aprop->type == PROPTYPE_PLAYER || aprop->type == PROPTYPE_CHR)
+			&& chr->team == aprop->chr->team) {
+		return;
+	}
+#endif
+
 	if (gset == NULL) {
 		gset = &gset2;
 	}

diff --git a/src/game/mplayer/mplayer.c b/src/game/mplayer/mplayer.c
@@ -524,6 +524,10 @@ void mpInit(void)
 		| MPOPTION_PAC_HIGHLIGHTTARGET
 		| MPOPTION_PAC_SHOWONRADAR;
 
+#ifndef PLATFORM_N64
+	g_MpSetup.options |= MPOPTION_FRIENDLYFIRE;
+#endif
+
 	g_Vars.mphilltime = 10;
 
 	func0f187fec();

diff --git a/src/game/mplayer/scenarios/capturethecase.inc b/src/game/mplayer/scenarios/capturethecase.inc
@@ -69,6 +69,14 @@ struct menuitem g_CtcOptionsMenuItems[] = {
 		MPOPTION_SPAWNWITHWEAPON,
 		menuhandlerMpCheckboxOption,
 	},
+	{
+		MENUITEMTYPE_CHECKBOX,
+		0,
+		MENUITEMFLAG_LOCKABLEMINOR | MENUITEMFLAG_LITERAL_TEXT,
+		(uintptr_t)"Friendly Fire",
+		MPOPTION_FRIENDLYFIRE,
+		menuhandlerMpDisplayTeam,
+	},
 #endif
 	{
 		MENUITEMTYPE_CHECKBOX,

diff --git a/src/game/mplayer/scenarios/combat.inc b/src/game/mplayer/scenarios/combat.inc
@@ -64,6 +64,14 @@ struct menuitem g_MpCombatOptionsMenuItems[] = {
 		MPOPTION_SPAWNWITHWEAPON,
 		menuhandlerMpCheckboxOption,
 	},
+	{
+		MENUITEMTYPE_CHECKBOX,
+		0,
+		MENUITEMFLAG_LOCKABLEMINOR | MENUITEMFLAG_LITERAL_TEXT,
+		(uintptr_t)"Friendly Fire",
+		MPOPTION_FRIENDLYFIRE,
+		menuhandlerMpDisplayTeam,
+	},
 #endif
 	{
 		MENUITEMTYPE_SEPARATOR,

diff --git a/src/game/mplayer/scenarios/hackthatmac.inc b/src/game/mplayer/scenarios/hackthatmac.inc
@@ -67,6 +67,14 @@ struct menuitem g_HtmOptionsMenuItems[] = {
 		MPOPTION_SPAWNWITHWEAPON,
 		menuhandlerMpCheckboxOption,
 	},
+	{
+		MENUITEMTYPE_CHECKBOX,
+		0,
+		MENUITEMFLAG_LOCKABLEMINOR | MENUITEMFLAG_LITERAL_TEXT,
+		(uintptr_t)"Friendly Fire",
+		MPOPTION_FRIENDLYFIRE,
+		menuhandlerMpDisplayTeam,
+	},
 #endif
 	{
 		MENUITEMTYPE_CHECKBOX,

diff --git a/src/game/mplayer/scenarios/holdthebriefcase.inc b/src/game/mplayer/scenarios/holdthebriefcase.inc
@@ -67,6 +67,14 @@ struct menuitem g_HtbOptionsMenuItems[] = {
 		MPOPTION_SPAWNWITHWEAPON,
 		menuhandlerMpCheckboxOption,
 	},
+	{
+		MENUITEMTYPE_CHECKBOX,
+		0,
+		MENUITEMFLAG_LOCKABLEMINOR | MENUITEMFLAG_LITERAL_TEXT,
+		(uintptr_t)"Friendly Fire",
+		MPOPTION_FRIENDLYFIRE,
+		menuhandlerMpDisplayTeam,
+	},
 #endif
 	{
 		MENUITEMTYPE_CHECKBOX,

diff --git a/src/game/mplayer/scenarios/kingofthehill.inc b/src/game/mplayer/scenarios/kingofthehill.inc
@@ -88,6 +88,14 @@ struct menuitem g_KohOptionsMenuItems[] = {
 		MPOPTION_SPAWNWITHWEAPON,
 		menuhandlerMpCheckboxOption,
 	},
+	{
+		MENUITEMTYPE_CHECKBOX,
+		0,
+		MENUITEMFLAG_LOCKABLEMINOR | MENUITEMFLAG_LITERAL_TEXT,
+		(uintptr_t)"Friendly Fire",
+		MPOPTION_FRIENDLYFIRE,
+		menuhandlerMpDisplayTeam,
+	},
 #endif
 	{
 		MENUITEMTYPE_CHECKBOX,

diff --git a/src/game/mplayer/scenarios/popacap.inc b/src/game/mplayer/scenarios/popacap.inc
@@ -65,6 +65,14 @@ struct menuitem g_PacOptionsMenuItems[] = {
 		MPOPTION_SPAWNWITHWEAPON,
 		menuhandlerMpCheckboxOption,
 	},
+	{
+		MENUITEMTYPE_CHECKBOX,
+		0,
+		MENUITEMFLAG_LOCKABLEMINOR | MENUITEMFLAG_LITERAL_TEXT,
+		(uintptr_t)"Friendly Fire",
+		MPOPTION_FRIENDLYFIRE,
+		menuhandlerMpDisplayTeam,
+	},
 #endif
 	{
 		MENUITEMTYPE_CHECKBOX,

diff --git a/src/include/constants.h b/src/include/constants.h
@@ -2890,6 +2890,7 @@
 #define MPOPTION_PAC_HIGHLIGHTTARGET    0x00080000
 #define MPOPTION_PAC_SHOWONRADAR        0x00100000
 #define MPOPTION_SPAWNWITHWEAPON        0x00200000
+#define MPOPTION_FRIENDLYFIRE           0x00400000
 
 #define MPPAUSEMODE_UNPAUSED 0
 #define MPPAUSEMODE_PAUSED   1