*** Merged Code from Multiplayer Branch Revision 2960 ***

- Virtual File System (VFS) by birdflu. This is needed for Multiplayer and is also used for Single Player. Very neat system :-)
- Multiplayer Version 1.1 + some additional features and bugfixes
* INFO: If you compile a new EXE and want to test, be sure to also use the latest SVN GameDir files in your JA2 install directory *




git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2961 3b4a5df2-a311-0410-b5c6-a8a6f20db521

Tactical/TeamTurns.cpp

@@ -932,16 +932,18 @@ void StartInterrupt( void )
 		}
 		// otherwise it's the AI interrupting another AI team
 
-		gTacticalStatus.ubCurrentTeam	= pSoldier->bTeam;
-
-		//#ifdef JA2BETAVERSION
+		if (pSoldier != NULL)
+			gTacticalStatus.ubCurrentTeam	= pSoldier->bTeam;
 		
 		if (is_networked)
-			ScreenMsg( FONT_MCOLOR_LTYELLOW, MSG_TESTVERSION, L"Interrupt ( could be hidden )" );
-		
-		//#endif
-		//send_interrupt( pSoldier );//hayden
-		StartNPCAI( pSoldier );
+		{
+			#ifdef JA2BETAVERSION
+				ScreenMsg( FONT_MCOLOR_LTYELLOW, MSG_TESTVERSION, L"Interrupt ( could be hidden )" );
+			#endif
+		}
+
+		if (pSoldier != NULL)
+			StartNPCAI( pSoldier );
 		
 		}
 	}
@@ -1776,11 +1778,14 @@ INT8 CalcInterruptDuelPts( SOLDIERTYPE * pSoldier, UINT8 ubOpponentID, BOOLEAN f
 	#ifdef DEBUG_INTERRUPTS
 		DebugMsg( TOPIC_JA2INTERRUPT, DBG_LEVEL_3, String("Calculating int pts for %d vs %d, number is %d", pSoldier->ubID, ubOpponentID, iPoints ) );
 	#endif
-if(is_networked)
-{
-	SOLDIERTYPE	*pOpp = &Menptr[ubOpponentID];
-	ScreenMsg( FONT_MCOLOR_LTYELLOW, MSG_CHAT, L"Interrupt: '%s' vs '%s' = %d points.",pSoldier->name,pOpp->name, iPoints );
-}
+	if(is_networked)
+	{
+		SOLDIERTYPE	*pOpp = &Menptr[ubOpponentID];
+
+		#ifdef JA2BETAVERSION
+			ScreenMsg( FONT_MCOLOR_LTYELLOW, MSG_MPSYSTEM, L"Interrupt: '%s' vs '%s' = %d points.",pSoldier->name,pOpp->name, iPoints );
+		#endif
+	}
 	DebugMsg (TOPIC_JA2INTERRUPT,DBG_LEVEL_3,"CalcInterruptDuelPts done");
 	return( (INT8)iPoints );
 }