1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-08-19 14:20:30 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merged from revision: 7391

Browse Source 
- 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
This commit is contained in:
Wanne
2014-08-12 17:03:45 +00:00
parent 36e9d15edc
commit 9b8169cd58
2 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Strategic/Map Screen Interface Map.cpp
+4 -7
View File
@@ -3895,6 +3895,7 @@ void DisplayPositionOfHelicopter( void )
GROUP *pGroup; GROUP *pGroup;
HVOBJECT hHandle; HVOBJECT hHandle;
INT32 iNumberOfPeopleInHelicopter = 0; INT32 iNumberOfPeopleInHelicopter = 0;
CHAR16 sString[ 4 ];
INT32 MAP_MVT_ICON_FONT = TINYFONT1; 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 ); 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( ); iNumberOfPeopleInHelicopter = GetNumberOfPassengersInHelicopter( );
swprintf( sString, L"%d", iNumberOfPeopleInHelicopter ); swprintf( sString, L"%d", iNumberOfPeopleInHelicopter );
@@ -4009,10 +4007,9 @@ void DisplayPositionOfHelicopter( void )
SetFontForeground( FONT_WHITE ); SetFontForeground( FONT_WHITE );
SetFontBackground( FONT_BLACK ); 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( ); RestoreClipRegionToFullScreen( );
Strategic/mapscreen.cpp
+1 -1
View File
@@ -5571,7 +5571,7 @@ UINT32 MapScreenHandle(void)
// if heli is around, show it // 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... // this is done on EVERY frame, I guess it beats setting entire map dirty all the time while he's moving...
DisplayPositionOfHelicopter( ); DisplayPositionOfHelicopter( );