From 9b8169cd5846d4df17896cdee06d9660d010c8a5 Mon Sep 17 00:00:00 2001 From: Wanne Date: Tue, 12 Aug 2014 17:03:45 +0000 Subject: [PATCH] Merged from revision: 7391 - Show helicopter icon in team view mode and restored helicopter passengers indicator (by Buggler) git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7392 3b4a5df2-a311-0410-b5c6-a8a6f20db521 --- Strategic/Map Screen Interface Map.cpp | 11 ++++------- Strategic/mapscreen.cpp | 2 +- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/Strategic/Map Screen Interface Map.cpp b/Strategic/Map Screen Interface Map.cpp index e637567c..123507fc 100644 --- a/Strategic/Map Screen Interface Map.cpp +++ b/Strategic/Map Screen Interface Map.cpp @@ -3895,6 +3895,7 @@ void DisplayPositionOfHelicopter( void ) GROUP *pGroup; HVOBJECT hHandle; INT32 iNumberOfPeopleInHelicopter = 0; + CHAR16 sString[ 4 ]; INT32 MAP_MVT_ICON_FONT = TINYFONT1; @@ -3998,10 +3999,7 @@ void DisplayPositionOfHelicopter( void ) BltVideoObject( FRAME_BUFFER, hHandle, HELI_ICON, x, y, VO_BLT_SRCTRANSPARENCY, NULL ); - // HEADROCK HAM 5: Do not draw anymore. - // now get number of people and blit that too - - /* + // now get number of people and blit that too iNumberOfPeopleInHelicopter = GetNumberOfPassengersInHelicopter( ); swprintf( sString, L"%d", iNumberOfPeopleInHelicopter ); @@ -4009,10 +4007,9 @@ void DisplayPositionOfHelicopter( void ) SetFontForeground( FONT_WHITE ); SetFontBackground( FONT_BLACK ); - mprintf( x + 5, y + 1 , sString ); - */ + mprintf( x + (MAP_GRID_X / 2) - 4, y + (MAP_GRID_Y / 2) - 4, sString ); - //InvalidateRegion( x, y, x + usIconWidth, y + usIconHeight ); + InvalidateRegion( x, y, x + usIconWidth, y + usIconHeight ); RestoreClipRegionToFullScreen( ); diff --git a/Strategic/mapscreen.cpp b/Strategic/mapscreen.cpp index 3c882e0d..2a75e127 100644 --- a/Strategic/mapscreen.cpp +++ b/Strategic/mapscreen.cpp @@ -5571,7 +5571,7 @@ UINT32 MapScreenHandle(void) // if heli is around, show it - if( fHelicopterAvailable && fShowAircraftFlag && ( iCurrentMapSectorZ == 0 ) && !fShowMapInventoryPool ) + if( fHelicopterAvailable && ( fShowAircraftFlag || fShowTeamFlag ) && ( iCurrentMapSectorZ == 0 ) && !fShowMapInventoryPool ) { // this is done on EVERY frame, I guess it beats setting entire map dirty all the time while he's moving... DisplayPositionOfHelicopter( );