mirror of
https://github.com/1dot13/source.git
synced 2026-08-12 14:10: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:
@@ -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() )
|
||||
|
||||
Reference in New Issue
Block a user