From 1b6e5af70bf442c684b891003e516329b190c130 Mon Sep 17 00:00:00 2001
From: BobTheBob <32057864+BobTheBob9@users.noreply.github.com>
Date: Tue, 14 Dec 2021 02:20:10 +0000
Subject: various fixes

---
 .../mod/scripts/vscripts/melee/_melee_synced_human.gnut        | 10 ++++++++++
 .../mod/scripts/vscripts/melee/_melee_synced_titan.gnut        |  6 ++++++
 2 files changed, 16 insertions(+)

(limited to 'Northstar.Custom/mod/scripts/vscripts/melee')

diff --git a/Northstar.Custom/mod/scripts/vscripts/melee/_melee_synced_human.gnut b/Northstar.Custom/mod/scripts/vscripts/melee/_melee_synced_human.gnut
index 068ffcfd..2f94e759 100644
--- a/Northstar.Custom/mod/scripts/vscripts/melee/_melee_synced_human.gnut
+++ b/Northstar.Custom/mod/scripts/vscripts/melee/_melee_synced_human.gnut
@@ -258,14 +258,20 @@ void function MeleeThread_PilotVsEnemy_Attacker( SyncedMelee action, entity atta
 
 	if ( isAttackerRef )
 	{
+		#if MP
 		if ( GetCurrentPlaylistVarInt( "fp_embark_enabled", 0 ) == 1 )
 			FirstPersonSequenceForce1P( attackerSequence, attacker )
+		#endif
+			
 		thread FirstPersonSequence( attackerSequence, attacker )
 	}
 	else
 	{
+		#if MP
 		if ( GetCurrentPlaylistVarInt( "fp_embark_enabled", 0 ) == 1 )
 			FirstPersonSequenceForce1P( attackerSequence, attacker, target )
+		#endif
+
 		thread FirstPersonSequence( attackerSequence, attacker, target )
 	}
 
@@ -403,15 +409,19 @@ void function MeleeThread_PilotVsEnemy_Target( SyncedMelee action, entity attack
 
 	if ( isAttackerRef )
 	{
+		#if MP
 		if ( GetCurrentPlaylistVarInt( "fp_embark_enabled", 0 ) == 1 )
 			FirstPersonSequenceForce1P( targetSequence, target, attacker )
+		#endif
 		
 		waitthread FirstPersonSequence( targetSequence, target, attacker )
 	}
 	else
 	{
+		#if MP
 		if ( GetCurrentPlaylistVarInt( "fp_embark_enabled", 0 ) == 1 )
 			FirstPersonSequenceForce1P( targetSequence, target )
+		#endif
 		
 		waitthread FirstPersonSequence( targetSequence, target )
 	}
diff --git a/Northstar.Custom/mod/scripts/vscripts/melee/_melee_synced_titan.gnut b/Northstar.Custom/mod/scripts/vscripts/melee/_melee_synced_titan.gnut
index be2e512e..d9e995f7 100644
--- a/Northstar.Custom/mod/scripts/vscripts/melee/_melee_synced_titan.gnut
+++ b/Northstar.Custom/mod/scripts/vscripts/melee/_melee_synced_titan.gnut
@@ -1330,6 +1330,7 @@ void function TitanVsTitan_3p( SyncedMelee action, entity attacker, entity targe
 	
 		attackerBodySequence.useAnimatedRefAttachment = true
 		
+		#if MP
 		// could use FirstPersonSequenceForce1P here, but since this uses a propdynamic rather than a player, easier to do it manually
 		if ( GetCurrentPlaylistVarInt( "fp_embark_enabled", 0 ) == 1 )
 		{
@@ -1356,6 +1357,7 @@ void function TitanVsTitan_3p( SyncedMelee action, entity attacker, entity targe
 			ScreenFadeFromBlack( attacker, 1.0, 0.5 )
 			thread Forced1PAttackerViewBodySequence( attackerBodySequence, attackerViewBodyProxy, attacker, camera )
 		}
+		#endif
 		
 		thread FirstPersonSequence( attackerBodySequence, attackerViewBody, attacker )
 	}
@@ -1369,6 +1371,7 @@ void function TitanVsTitan_3p( SyncedMelee action, entity attacker, entity targe
 
 	if ( isAttackerRef )
 	{
+		#if MP
 		if ( GetCurrentPlaylistVarInt( "fp_embark_enabled", 0 ) == 1 )
 		{
 			if ( attacker.IsPlayer() && !attackerDoing1PViewbodyAnim )
@@ -1377,12 +1380,14 @@ void function TitanVsTitan_3p( SyncedMelee action, entity attacker, entity targe
 			if ( target.IsPlayer() )
 				FirstPersonSequenceForce1P( targetSequence, target, attacker )
 		}
+		#endif
 		
 		thread FirstPersonSequence( attackerSequence, attacker )
 		waitthread FirstPersonSequence( targetSequence, target, attacker )
 	}
 	else
 	{
+		#if MP
 		if ( GetCurrentPlaylistVarInt( "fp_embark_enabled", 0 ) == 1 )
 		{
 			if ( target.IsPlayer() )
@@ -1391,6 +1396,7 @@ void function TitanVsTitan_3p( SyncedMelee action, entity attacker, entity targe
 			if ( attacker.IsPlayer() && !attackerDoing1PViewbodyAnim )
 				FirstPersonSequenceForce1P( attackerSequence, attacker, target )
 		}
+		#endif
 	
 		thread FirstPersonSequence( targetSequence, target )
 		waitthread FirstPersonSequence( attackerSequence, attacker, target )
-- 
cgit v1.2.3