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

added missing code from commit 9059

Browse Source 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9073 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Shadooow
2021-06-12 09:43:43 +00:00
parent d46cbda2b6
commit a854f73ba9
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Tactical/Soldier Control.cpp
+5 -5
View File
@@ -13162,12 +13162,12 @@ void SOLDIERTYPE::EVENT_SoldierBeginPunchAttack( INT32 sGridNo, UINT8 ubDirectio
if ( gAnimControl[pTSoldier->usAnimState].ubEndHeight == ANIM_STAND )
{
// if we aim for legs, always use kick
if ( this->bAimShotLocation == AIM_SHOT_LEGS && !(ubDirection & 1) && !nokick )
if ( this->bAimMeleeLocation == AIM_SHOT_LEGS && !(ubDirection & 1) && !nokick )
{
this->EVENT_InitNewSoldierAnim( FOCUSED_HTH_KICK, 0, FALSE );
}
// if we aim for head, always use punch animation
else if ( this->bAimShotLocation == AIM_SHOT_HEAD || (ubDirection & 1) )
else if ( this->bAimMeleeLocation == AIM_SHOT_HEAD || (ubDirection & 1) )
{
this->EVENT_InitNewSoldierAnim( FOCUSED_PUNCH, 0, FALSE );
}
@@ -13202,12 +13202,12 @@ void SOLDIERTYPE::EVENT_SoldierBeginPunchAttack( INT32 sGridNo, UINT8 ubDirectio
if ( gAnimControl[pTSoldier->usAnimState].ubEndHeight == ANIM_STAND )
{
// if we aim for legs, always use kick
if ( this->bAimShotLocation == AIM_SHOT_LEGS && !(ubDirection & 1) && !nokick )
if ( this->bAimMeleeLocation == AIM_SHOT_LEGS && !(ubDirection & 1) && !nokick )
{
this->EVENT_InitNewSoldierAnim( HTH_KICK, 0, FALSE );
}
// if we aim for head, always use punch animation
else if ( this->bAimShotLocation == AIM_SHOT_HEAD || (ubDirection & 1) )
else if ( this->bAimMeleeLocation == AIM_SHOT_HEAD || (ubDirection & 1) )
{
this->EVENT_InitNewSoldierAnim( PUNCH, 0, FALSE );
}
@@ -13223,7 +13223,7 @@ void SOLDIERTYPE::EVENT_SoldierBeginPunchAttack( INT32 sGridNo, UINT8 ubDirectio
else // if crouching enemy
{
// random if aiming on head, favor kick though
if ( this->bAimShotLocation == AIM_SHOT_HEAD || (ubDirection & 1) || nokick )
if ( this->bAimMeleeLocation == AIM_SHOT_HEAD || (ubDirection & 1) || nokick )
{
if ( nokick || Random( 20 ) > 12 || (ubDirection & 1) )
this->EVENT_InitNewSoldierAnim( PUNCH, 0, FALSE );