- New Feature: Now it is possible to compile a JA2 1.13 Demo executable with the actual 1.13 source code (by Jazz)

o This JA2 demo executable is as close as possible to the original JA2 demo, but with the 1.13 features!
--> No laptop, disabled strategy actions, auto merc hired, only P1 maps, ...
o To build the 1.13 executable, just enable the "JA113DEMO" define in builddefines.h
o The 1.13 demo executable will read from ja2_Demo.ini instead of ja2.ini
o You also need the "Data-JA2Demo" folder from the official 1.13 SVN GameDir: https://ja2svn.dyndns.org/source/ja2_v1.13_data/GameDir
o Once you start the game with the demo executable, you will notice the "START DEMO" instead of "START NEW GAME" in the main menu
o Multiplayer is disabled in the demo executable

- There is another new define called "JA113NODEMO" (by Jazz)
o See builddefines.h
o If this define is enabled, a special version of 1.13 is build
-> Disable all meanwhiles, emails, blocked quest with queen, alien queen


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5287 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Wanne
2012-05-18 11:20:11 +00:00
parent 9a2896d72c
commit d23a94eefc
47 changed files with 385 additions and 97 deletions
+6 -6
View File
@@ -1483,7 +1483,7 @@ void BeginLoadScreen( void )
SetCurrentCursorFromDatabase( VIDEO_NO_CURSOR );
#ifdef JA2UB
#if (defined JA2UB || defined JA113NODEMO)
if( guiCurrentScreen == MAP_SCREEN && !(gTacticalStatus.uiFlags & LOADING_SAVED_GAME) )
#else
//Ja25: No meanwhiles
@@ -1903,7 +1903,7 @@ void GetMapFileName(INT16 sMapX,INT16 sMapY, INT8 bSectorZ, STR8 bString, BOOLEA
}
}
#ifdef JA2UB
#if (defined JA2UB || defined JA113NODEMO)
/* Ja25: No meanwhiles */
#else
// If we are in a meanwhile...
@@ -2386,7 +2386,7 @@ void PrepareLoadedSector()
BOOLEAN fEnemyPresenceInThisSector = FALSE;
BOOLEAN fAddCivs = TRUE;
INT8 bMineIndex = -1;
#ifdef JA2UB
#if (defined JA2UB || defined JA113NODEMO)
//Ja25 No meanwhiles
#else
if( AreInMeanwhile( ) == FALSE )
@@ -2415,7 +2415,7 @@ void PrepareLoadedSector()
if( !(gTacticalStatus.uiFlags & LOADING_SAVED_GAME ))
{
#ifdef JA2UB
#if (defined JA2UB || defined JA113NODEMO)
//Ja25 No meanwhiles
#else
if ( !AreReloadingFromMeanwhile( ) )
@@ -2540,7 +2540,7 @@ void PrepareLoadedSector()
{
AddProfilesNotUsingProfileInsertionData();
}
#ifdef JA2UB
#if (defined JA2UB || defined JA113NODEMO)
//Ja25 No meanwhiles
#else
if( !AreInMeanwhile() || GetMeanwhileID() == INTERROGATION )
@@ -2918,7 +2918,7 @@ BOOLEAN EnterSector( INT16 sSectorX, INT16 sSectorY , INT8 bSectorZ )
memset( &(gTacticalStatus.bNumFoughtInBattle), 0, MAXTEAMS );
}
#ifdef JA2UB
#if (defined JA2UB || defined JA113NODEMO)
//Ja25 No meanwhiles
#else
if( AreInMeanwhile() == FALSE )