1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-07-29 13:52:17 +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
Tactical/Overhead.cpp
+4 -4
View File
@@ -6249,7 +6249,7 @@ void SetEnemyPresence( )
// If we are just starting game, don't do this!
#if (defined JA2UB || defined JA113NODEMO)
#if (defined JA2UB)
//Ja25: no meanwhiles
if ( !DidGameJustStart() )
#else
@@ -6791,7 +6791,7 @@ BOOLEAN CheckForEndOfBattle( BOOLEAN fAnEnemyRetreated )
SetFactTrue( FACT_FIRST_BATTLE_FOUGHT );
SetFactFalse( FACT_FIRST_BATTLE_BEING_FOUGHT );
SetTheFirstBattleSector( (INT16) (gWorldSectorX + gWorldSectorY * MAP_WORLD_X) );
#if (defined JA2UB || defined JA113NODEMO)
#if (defined JA2UB)
//Ja25 no meanwhile
#else
HandleFirstBattleEndingWhileInTown( gWorldSectorX, gWorldSectorY, gbWorldSectorZ, FALSE );
@@ -7051,7 +7051,7 @@ BOOLEAN CheckForEndOfBattle( BOOLEAN fAnEnemyRetreated )
SetFactTrue( FACT_FIRST_BATTLE_WON );
SetFactFalse( FACT_FIRST_BATTLE_BEING_FOUGHT );
SetTheFirstBattleSector( (INT16) (gWorldSectorX + gWorldSectorY * MAP_WORLD_X) );
#if (defined JA2UB || defined JA113NODEMO)
#if (defined JA2UB)
//Ja25 no meanwhile
#else
HandleFirstBattleEndingWhileInTown( gWorldSectorX, gWorldSectorY, gbWorldSectorZ, FALSE );
@@ -8747,7 +8747,7 @@ SOLDIERTYPE *InternalReduceAttackBusyCount( )
// Go into combat!
// If we are in a meanwhile... don't enter combat here...
#if (defined JA2UB || defined JA113NODEMO)
#if (defined JA2UB)
//Ja25 no meanwhiles
#else
if ( !AreInMeanwhile( ) )