**********************************************************

** Big Maps Projects code (incl. Multiplayer v1.5 **
**********************************************************
- Merged Big Maps Project code from BMP+MP trunk (Revision: 3340)
o Complete SVN Revision history: https://81.169.133.124/source/ja2/branches/Wanne/JA2%201.13%20MP
- Before THIS merge, I made a branch of the existing 1.13 source
o SVN Branch: https://81.169.133.124/source/ja2/branches/JA2_rev.3336/src
- Removed old VS 6.0 and VS 2003 project and solutions files, because compilation is broken long time ago
- I will add VS 2010 projects and solution file in the next few days

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@3341 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Wanne
2010-02-28 18:38:52 +00:00
parent a98c44ac78
commit 14750c6903
461 changed files with 23615 additions and 120157 deletions
+8 -3
View File
@@ -147,7 +147,7 @@ BOOLEAN guiTacticalLeaveScreen = FALSE;
void HandleModalTactical( );
extern void CheckForDisabledRegionRemove( );
extern void InternalLocateGridNo( INT16 sGridNo, BOOLEAN fForce );
extern void InternalLocateGridNo( INT32 sGridNo, BOOLEAN fForce );
@@ -214,6 +214,9 @@ UINT32 MainGameScreenShutdown(void)
// Remove video Overlays
RemoveVideoOverlay( giFPSOverlay );
// WANNE: Plug a vanilla one-time memory leak.
// Fixed by Tron (Stracciatella): Revision: 6933
RemoveVideoOverlay( giCounterPeriodOverlay );
return TRUE;
}
@@ -428,13 +431,16 @@ UINT32 MainGameScreenHandle(void)
//DO NOT MOVE THIS FUNCTION CALL!!!
//This determines if the help screen should be active
// if( ( !gfTacticalDoHeliRun && !gfFirstHeliRun ) && ShouldTheHelpScreenComeUp( HELP_SCREEN_TACTICAL, FALSE ) )
// WANNE: Never show the helpscreen when leaving editor and going to the tactical game
#ifndef JA2EDITOR
if( !gfPreBattleInterfaceActive && ShouldTheHelpScreenComeUp( HELP_SCREEN_TACTICAL, FALSE ) )
{
// handle the help screen
HelpScreenHandler();
return( GAME_SCREEN );
}
#endif
#ifdef JA2BETAVERSION
@@ -1118,7 +1124,6 @@ void InitHelicopterEntranceByMercs( void )
if( (gGameExternalOptions.iGameStartingTime + gGameExternalOptions. iFirstArrivalDelay) < 111600 ||
(gGameExternalOptions.iGameStartingTime + gGameExternalOptions.iFirstArrivalDelay >= 162000))
{
// Default: Night
gubEnvLightValue = 12;
}
else