From 837709a448de14d35471f4493b0727d2d8178ca1 Mon Sep 17 00:00:00 2001 From: silversurfer Date: Wed, 14 Aug 2019 15:20:10 +0000 Subject: [PATCH] Fix: Mercs that entered a vehicle on the strategic map while standing on a roof would appear at roof level after arriving in another sector and exiting the vehicle in strategic after loading the map. Now all mercs entering vehicles are reset to ground level. git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8689 3b4a5df2-a311-0410-b5c6-a8a6f20db521 --- GameVersion.cpp | 4 ++-- Tactical/Vehicles.cpp | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/GameVersion.cpp b/GameVersion.cpp index 2eb7cb5b..e6a28080 100644 --- a/GameVersion.cpp +++ b/GameVersion.cpp @@ -55,8 +55,8 @@ #endif -CHAR8 czVersionNumber[16] = { "Build 19.08.11" }; //YY.MM.DD +CHAR8 czVersionNumber[16] = { "Build 19.08.14" }; //YY.MM.DD CHAR16 zTrackingNumber[16] = { L"Z" }; -CHAR16 zRevisionNumber[16] = { L"Revision 8686" }; +CHAR16 zRevisionNumber[16] = { L"Revision 8689" }; // SAVE_GAME_VERSION is defined in header, change it there diff --git a/Tactical/Vehicles.cpp b/Tactical/Vehicles.cpp index 0a3fb37c..515ef276 100644 --- a/Tactical/Vehicles.cpp +++ b/Tactical/Vehicles.cpp @@ -678,6 +678,9 @@ BOOLEAN AddSoldierToVehicle( SOLDIERTYPE *pSoldier, INT32 iId, UINT8 ubSeatIndex // Remove soldier's graphic pSoldier->RemoveSoldierFromGridNo( ); + // anyone entering a vehicle will be reset to ground level + pSoldier->SetSoldierHeight(FIRST_LEVEL); + if ( pVehicleSoldier ) { // bInitialActionPoints - point in time where soldier and vehicle start sharing timeline