From bd22863e459ba5c30a1c1161518973f120f799f7 Mon Sep 17 00:00:00 2001 From: Wanne Date: Wed, 23 May 2007 18:41:42 +0000 Subject: [PATCH] - bugfix: If merc is in crouched stance and he passes an item to another merc, he did not change his direction git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@895 3b4a5df2-a311-0410-b5c6-a8a6f20db521 --- JA2.suo | Bin 197632 -> 197632 bytes Tactical/Interface Items.cpp | 21 +++++++++++++++------ 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/JA2.suo b/JA2.suo index 6e014718bf44a1d7e408e16c7d7ad464131cd2c4..198f334df7eeb755ab5dfc364463e6de7eeb5a32 100644 GIT binary patch delta 7347 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 diff --git a/Tactical/Interface Items.cpp b/Tactical/Interface Items.cpp index 662f2988..2bb44cdf 100644 --- a/Tactical/Interface Items.cpp +++ b/Tactical/Interface Items.cpp @@ -5116,20 +5116,29 @@ BOOLEAN HandleItemPointerClick( UINT16 usMapPos ) // Stop merc first.... EVENT_StopMerc( pSoldier, pSoldier->sGridNo, pSoldier->bDirection ); - // If we are standing only... - if ( gAnimControl[ pSoldier->usAnimState ].ubEndHeight == ANIM_STAND && !MercInWater( pSoldier ) ) + // WANNE: Also turn merc if he is crouched and he passes an item + if ( !MercInWater( pSoldier ) ) { // Turn to face, then do animation.... EVENT_SetSoldierDesiredDirection( pSoldier, ubFacingDirection ); pSoldier->fTurningUntilDone = TRUE; - pSoldier->usPendingAnimation = PASS_OBJECT; - } - if ( gAnimControl[ gpItemPointerSoldier->usAnimState ].ubEndHeight == ANIM_STAND && !MercInWater( gpItemPointerSoldier ) ) + if (gAnimControl[ pSoldier->usAnimState ].ubEndHeight == ANIM_STAND) + { + pSoldier->usPendingAnimation = PASS_OBJECT; + } + } + + // WANNE: Also turn merc if he is crouched and he received the passed item + if ( !MercInWater( gpItemPointerSoldier ) ) { EVENT_SetSoldierDesiredDirection( gpItemPointerSoldier, gOppositeDirection[ ubFacingDirection ] ); gpItemPointerSoldier->fTurningUntilDone = TRUE; - gpItemPointerSoldier->usPendingAnimation = PASS_OBJECT; + + if (gAnimControl[ gpItemPointerSoldier->usAnimState ].ubEndHeight == ANIM_STAND) + { + gpItemPointerSoldier->usPendingAnimation = PASS_OBJECT; + } } }