Merge branch 'master' into ExtraMercs

Ja2/gamescreen.h

@@ -0,0 +1,44 @@
+#ifndef _GAMESCREEN_H
+#define _GAMESCREEN_H
+
+
+#include "fade screen.h"
+
+#define		ARE_IN_FADE_IN( )		( gfFadeIn || gfFadeInitialized )
+
+
+
+void FadeInGameScreen( );
+void FadeOutGameScreen( );
+
+typedef void (*MODAL_HOOK)( void );	
+
+
+extern BOOLEAN	gfGameScreenLocateToSoldier;
+extern BOOLEAN	gfEnteringMapScreen;
+extern UINT16	gubPreferredInitialSelectedGuy;
+
+
+void EnterMapScreen( );
+
+void UpdateTeamPanelAssignments( );
+
+
+
+
+
+#define TACTICAL_MODAL_NOMOUSE			1
+#define TACTICAL_MODAL_WITHMOUSE		2
+
+extern MODAL_HOOK		gModalDoneCallback;
+
+void EnterModalTactical( INT8 bMode );
+void EndModalTactical( );
+
+
+// handle the entrance of the mercs at the beginning of the game 
+void InitHelicopterEntranceByMercs( void );
+
+void InternalLeaveTacticalScreen( UINT32 uiNewScreen );
+
+#endif