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