- 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:
Wanne
2013-12-28 18:27:09 +00:00
parent 5bf82b9d82
commit 44cf72a2e0
37 changed files with 78 additions and 73 deletions
+3 -3
View File
@@ -1292,7 +1292,7 @@ BOOLEAN AdjustToNextAnimationFrame( SOLDIERTYPE *pSoldier )
}
else
{
#if (defined JA2UB)
#ifdef JA2UB
//Ja25 No meanwhiles
if ( fMartialArtist )
#else
@@ -4134,7 +4134,7 @@ void CheckForAndHandleSoldierIncompacitated( SOLDIERTYPE *pSoldier )
}
// OK, if we are in a meanwhile and this is elliot...
#if (defined JA2UB)
#ifdef JA2UB
//ja25: No queen
#else
if ( AreInMeanwhile( ) )
@@ -4158,7 +4158,7 @@ void CheckForAndHandleSoldierIncompacitated( SOLDIERTYPE *pSoldier )
// If guy is now dead, play sound!
if ( pSoldier->stats.bLife == 0 )
{
#if (defined JA2UB)
#ifdef JA2UB
//Ja25 No meanwhiles
#else
if ( !AreInMeanwhile() )