From 75ddf38ece87f7cb3fab28caec71b61ba549c497 Mon Sep 17 00:00:00 2001 From: Wanne Date: Fri, 27 Jun 2014 06:41:55 +0000 Subject: [PATCH] Vehicle Bugfixes (by anv) - fix: problem with ctrl not swapping passengers on seats further than 6 - fix: vehicle ramming people not working properly when driving in non-diagonal directions git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7294 3b4a5df2-a311-0410-b5c6-a8a6f20db521 --- Tactical/Turn Based Input.cpp | 2 +- TileEngine/structure.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Tactical/Turn Based Input.cpp b/Tactical/Turn Based Input.cpp index db258a7b..ad89e17c 100644 --- a/Tactical/Turn Based Input.cpp +++ b/Tactical/Turn Based Input.cpp @@ -6887,7 +6887,7 @@ void SwapMercPortraits ( SOLDIERTYPE *pSoldier, INT8 bDirection ) if( pSoldier->flags.uiStatusFlags & ( SOLDIER_DRIVER | SOLDIER_PASSENGER ) ) { SOLDIERTYPE *pVehicle = GetSoldierStructureForVehicle( pSoldier->iVehicleId ); - if( pVehicle != NULL && bNewPosition < gNewVehicle[pVehicle->bVehicleID].iNewSeatingCapacities ) + if( pVehicle != NULL && bNewPosition < gNewVehicle[ pVehicleList[ pVehicle->bVehicleID ].ubVehicleType ].iNewSeatingCapacities ) { if( SwapVehicleSeat( pVehicle, pSoldier, bNewPosition ) ) { diff --git a/TileEngine/structure.cpp b/TileEngine/structure.cpp index 0bbafd17..af027541 100644 --- a/TileEngine/structure.cpp +++ b/TileEngine/structure.cpp @@ -742,7 +742,7 @@ BOOLEAN OkayToAddStructureToTile( INT32 sBaseGridNo, INT16 sCubeOffset, DB_STRUC { pExistingStructure = pExistingStructure->pNext; // damage people when driving on them - if( fAddingForReal && ( MercPtrs[ sSoldierID ]->flags.fPastXDest || MercPtrs[ sSoldierID ]->flags.fPastYDest ) ) + if( fAddingForReal ) { if( TANK( MercPtrs[ sSoldierID ] ) ) {