1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-08-05 14:00:23 +02:00
Code Issues Packages Projects Releases Wiki Activity

- Removed the "JA113NODEMO" define

Browse Source 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5514 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Wanne
2012-08-24 08:15:20 +00:00
parent 061ea16cea
commit 114f0064c4
38 changed files with 87 additions and 121 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Strategic/strategicmap.cpp
+6 -6
View File
@@ -1485,7 +1485,7 @@ void BeginLoadScreen( void )
SetCurrentCursorFromDatabase( VIDEO_NO_CURSOR );
#if (defined JA2UB || defined JA113NODEMO)
#if (defined JA2UB)
if( guiCurrentScreen == MAP_SCREEN && !(gTacticalStatus.uiFlags & LOADING_SAVED_GAME) )
#else
//Ja25: No meanwhiles
@@ -1905,7 +1905,7 @@ void GetMapFileName(INT16 sMapX,INT16 sMapY, INT8 bSectorZ, STR8 bString, BOOLEA
}
}
#if (defined JA2UB || defined JA113NODEMO)
#if (defined JA2UB)
/* Ja25: No meanwhiles */
#else
// If we are in a meanwhile...
@@ -2388,7 +2388,7 @@ void PrepareLoadedSector()
BOOLEAN fEnemyPresenceInThisSector = FALSE;
BOOLEAN fAddCivs = TRUE;
INT8 bMineIndex = -1;
#if (defined JA2UB || defined JA113NODEMO)
#if (defined JA2UB)
//Ja25 No meanwhiles
#else
if( AreInMeanwhile( ) == FALSE )
@@ -2417,7 +2417,7 @@ void PrepareLoadedSector()
if( !(gTacticalStatus.uiFlags & LOADING_SAVED_GAME ))
{
#if (defined JA2UB || defined JA113NODEMO)
#if (defined JA2UB)
//Ja25 No meanwhiles
#else
if ( !AreReloadingFromMeanwhile( ) )
@@ -2542,7 +2542,7 @@ void PrepareLoadedSector()
{
AddProfilesNotUsingProfileInsertionData();
}
#if (defined JA2UB || defined JA113NODEMO)
#if (defined JA2UB)
//Ja25 No meanwhiles
#else
if( !AreInMeanwhile() || GetMeanwhileID() == INTERROGATION )
@@ -2920,7 +2920,7 @@ BOOLEAN EnterSector( INT16 sSectorX, INT16 sSectorY , INT8 bSectorZ )
memset( &(gTacticalStatus.bNumFoughtInBattle), 0, MAXTEAMS );
}
#if (defined JA2UB || defined JA113NODEMO)
#if (defined JA2UB)
//Ja25 No meanwhiles
#else
if( AreInMeanwhile() == FALSE )