From c890640e1d367ff37f651d3d4681c544e0e9a25d Mon Sep 17 00:00:00 2001 From: Shadooow Date: Sun, 23 May 2021 21:32:16 +0000 Subject: [PATCH] fix: vehicle assignment will no longer show destroyed vehicles fix: helicopter will no longer be available when Skyrider dies (will not work in saved games where he is already dead though) git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9040 3b4a5df2-a311-0410-b5c6-a8a6f20db521 --- Tactical/Overhead.cpp | 5 ++++- Tactical/Vehicles.cpp | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/Tactical/Overhead.cpp b/Tactical/Overhead.cpp index 38602d2df..004348922 100644 --- a/Tactical/Overhead.cpp +++ b/Tactical/Overhead.cpp @@ -3976,7 +3976,10 @@ void HandleNPCTeamMemberDeath( SOLDIERTYPE *pSoldierOld ) EndQuest( QUEST_KILL_DEIDRANNA, pSoldierOld->sSectorX, pSoldierOld->sSectorY ); break; - + case SKYRIDER: + //shadooow: disables helicopter use if skyrider dies + fSkyRiderAvailable = FALSE; + break; } #endif diff --git a/Tactical/Vehicles.cpp b/Tactical/Vehicles.cpp index 89381e293..5e991d40e 100644 --- a/Tactical/Vehicles.cpp +++ b/Tactical/Vehicles.cpp @@ -445,7 +445,7 @@ BOOLEAN IsThisVehicleAccessibleToSoldier( SOLDIERTYPE *pSoldier, INT32 iId ) } // now check if vehicle is valid - if( pVehicleList[ iId ].fValid == FALSE ) + if( pVehicleList[ iId ].fValid == FALSE || pVehicleList[iId].fDestroyed == TRUE) { return( FALSE ); }