From 81644fef0410c1c2b62a7d18f61a94d4096a1757 Mon Sep 17 00:00:00 2001 From: Flugente Date: Thu, 11 Sep 2014 22:23:10 +0000 Subject: [PATCH] If walking with an aimed gun, do not return to standing animation but to aiming animation. git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7509 3b4a5df2-a311-0410-b5c6-a8a6f20db521 --- Tactical/Soldier Control.cpp | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/Tactical/Soldier Control.cpp b/Tactical/Soldier Control.cpp index 7fa3f1f3..8fe0a6ad 100644 --- a/Tactical/Soldier Control.cpp +++ b/Tactical/Soldier Control.cpp @@ -7163,6 +7163,15 @@ void SOLDIERTYPE::SoldierGotoStationaryStance( void ) { this->EVENT_InitNewSoldierAnim( START_COWER, 0, FALSE ); } + // Flugente: if we walk with our gun raised, we should still have it raised once we stop walking + else if ( this->usAnimState == WALKING_WEAPON_RDY || this->usAnimState == AIM_RIFLE_STAND ) + { + this->EVENT_InitNewSoldierAnim( AIM_RIFLE_STAND, 0, FALSE ); + } + else if ( this->usAnimState == WALKING_DUAL_RDY || this->usAnimState == AIM_DUAL_STAND ) + { + this->EVENT_InitNewSoldierAnim( AIM_DUAL_STAND, 0, FALSE ); + } else { this->EVENT_InitNewSoldierAnim( STANDING, 0, FALSE );