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