- 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
+4 -4
View File
@@ -5538,7 +5538,7 @@ void SOLDIERTYPE::EVENT_SoldierGotHit( UINT16 usWeaponIndex, INT16 sDamage, INT1
}
////////////////////////////////////////////////////////////////////////////
sDamage = sDamage / PUNCH_REAL_DAMAGE_PORTION;
#ifdef JA2UB
#if (defined JA2UB || defined JA113NODEMO)
//Ja25: No meanwhiles
#else
if ( AreInMeanwhile() && gCurrentMeanwhileDef.ubMeanwhileID == INTERROGATION )
@@ -8845,7 +8845,7 @@ void SOLDIERTYPE::BeginSoldierGetup( void )
{
return;
}
#ifdef JA2UB
#if (defined JA2UB || defined JA113NODEMO)
//Ja25: No meanwhiles
#else
// ATE: Don't getup if we are in a meanwhile
@@ -9092,7 +9092,7 @@ UINT8 SOLDIERTYPE::SoldierTakeDamage( INT8 bHeight, INT16 sLifeDeduct, INT16 sBr
// Turn off
this->flags.uiStatusFlags &= ( ~SOLDIER_NPC_SHOOTING );
}
#ifdef JA2UB
#if (defined JA2UB || defined JA113NODEMO)
//Ja25: No meanwhiles
#else
// CJC: make sure Elliot doesn't bleed to death!
@@ -11373,7 +11373,7 @@ void SOLDIERTYPE::EVENT_SoldierBeginPunchAttack( INT32 sGridNo, UINT8 ubDirectio
}
//Ja25 No meanwhiles
#ifdef JA2UB
#if (defined JA2UB || defined JA113NODEMO)
if ( fMartialArtist && !Item[usItem].crowbar && this->ubBodyType == REGMALE)
#else
if ( fMartialArtist && !AreInMeanwhile( ) && !Item[usItem].crowbar && this->ubBodyType == REGMALE ) // SANDRO - added check for body type