From b320052d6b13d1e5c5522ce6404f8e2e7da7d429 Mon Sep 17 00:00:00 2001 From: Shadooow Date: Tue, 11 Jan 2022 20:49:37 +0000 Subject: [PATCH] Revert of 9241 and a new more coherent solution which works for hot drops as well. git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9242 3b4a5df2-a311-0410-b5c6-a8a6f20db521 --- Tactical/Merc Entering.cpp | 1 - Tactical/Soldier Add.cpp | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/Tactical/Merc Entering.cpp b/Tactical/Merc Entering.cpp index 9da415338..6a4258788 100644 --- a/Tactical/Merc Entering.cpp +++ b/Tactical/Merc Entering.cpp @@ -568,7 +568,6 @@ void HandleHeliDrop( BOOLEAN fPlayer ) #else //MercPtrs[ gusHeliSeats[ cnt ] ]->ubStrategicInsertionCode = INSERTION_CODE_NORTH; MercPtrs[ gusHeliSeats[ cnt ] ]->ubStrategicInsertionCode = INSERTION_CODE_GRIDNO; - MercPtrs[gusHeliSeats[cnt]]->ubDirection = EAST; // sevenfm: if soldiers land into enemy sector, use gsGridNoSweetSpot //MercPtrs[ gusHeliSeats[ cnt ] ]->usStrategicInsertionData = gGameExternalOptions.iInitialMercArrivalLocation; MercPtrs[gusHeliSeats[cnt]]->usStrategicInsertionData = gsGridNoSweetSpot; diff --git a/Tactical/Soldier Add.cpp b/Tactical/Soldier Add.cpp index cc9f4672e..afb5c4ee2 100644 --- a/Tactical/Soldier Add.cpp +++ b/Tactical/Soldier Add.cpp @@ -42,7 +42,7 @@ //forward declarations of common classes to eliminate includes class OBJECTTYPE; class SOLDIERTYPE; - +extern BOOLEAN gfHandleHeli; // Adds a soldier to a world gridno and set's direction void AddSoldierToSectorGridNo( SOLDIERTYPE *pSoldier, INT32 sGridNo, UINT8 ubDirection, BOOLEAN fUseAnimation, UINT16 usAnimState, UINT16 usAnimCode ); @@ -1317,7 +1317,7 @@ BOOLEAN InternalAddSoldierToSector( UINT8 ubID, BOOLEAN fCalculateDirection, BOO } //Add - if(gTacticalStatus.uiFlags & LOADING_SAVED_GAME || (pSoldier->ubStrategicInsertionCode == INSERTION_CODE_GRIDNO && !gfEnteredFromTacticalPlacement)) + if(gTacticalStatus.uiFlags & LOADING_SAVED_GAME || (pSoldier->ubStrategicInsertionCode == INSERTION_CODE_GRIDNO && !gfHandleHeli && !gfEnteredFromTacticalPlacement)) AddSoldierToSectorGridNo( pSoldier, sGridNo, pSoldier->ubDirection, TRUE, -1, 0);//shadooow: hack to make sure animations aren't changed else AddSoldierToSectorGridNo( pSoldier, sGridNo, ubDirection, fUseAnimation, usAnimState, usAnimCode );