mirror of
https://github.com/1dot13/source.git
synced 2026-08-05 14:00:23 +02:00
- Fixed compilation error for JA2UB define (by anv)
- Added missing string to _FrenchText.cpp - Renamed the "#if (defined JA2UB)" to "#ifdef JA2UB" so we are consistent through the code git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6719 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
@@ -6157,7 +6157,7 @@ void SetEnemyPresence( )
|
||||
|
||||
// If we are just starting game, don't do this!
|
||||
|
||||
#if (defined JA2UB)
|
||||
#ifdef JA2UB
|
||||
//Ja25: no meanwhiles
|
||||
if ( !DidGameJustStart() )
|
||||
#else
|
||||
@@ -7033,7 +7033,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)
|
||||
#ifdef JA2UB
|
||||
//Ja25 no meanwhile
|
||||
#else
|
||||
HandleFirstBattleEndingWhileInTown( gWorldSectorX, gWorldSectorY, gbWorldSectorZ, FALSE );
|
||||
@@ -7313,7 +7313,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)
|
||||
#ifdef JA2UB
|
||||
//Ja25 no meanwhile
|
||||
#else
|
||||
HandleFirstBattleEndingWhileInTown( gWorldSectorX, gWorldSectorY, gbWorldSectorZ, FALSE );
|
||||
@@ -9210,7 +9210,7 @@ SOLDIERTYPE *InternalReduceAttackBusyCount( )
|
||||
// Go into combat!
|
||||
|
||||
// If we are in a meanwhile... don't enter combat here...
|
||||
#if (defined JA2UB)
|
||||
#ifdef JA2UB
|
||||
//Ja25 no meanwhiles
|
||||
#else
|
||||
if ( !AreInMeanwhile( ) )
|
||||
|
||||
Reference in New Issue
Block a user