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

- Fix for Map Sector Inv keyboard shortcut (by Buggler)

Browse Source 
o Map Screen Interface Map Inventory.cpp was not updated in 4647 revision resulting in no popup

- Heli ETA Box (by Buggler)
o Partial Graphical Fix on the Heli ETA Box for 1024x768 by correcting e coordinates due to larger font used
o Updated ETA_POP_UP.STI and POS2.sti for 1024x768 resolution (by Wanne)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4668 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Wanne
2011-10-02 18:59:13 +00:00
parent e7feba6d69
commit 1d509e4d8a
5 changed files with 27 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Strategic/Map Screen Interface Border.cpp
+2 -1
View File
@@ -315,7 +315,8 @@ void RenderMapBorderEtaPopUp( void )
offsetBorderY = offsetY + 19;
}
BltVideoObject( FRAME_BUFFER , hHandle, 0, MAP_BORDER_X + MAP_BORDER_X_OFFSET + offsetX, MAP_BORDER_Y_OFFSET + offsetY, VO_BLT_SRCTRANSPARENCY,NULL );
// TODO.RW: Adjust for 1024x768
BltVideoObject( FRAME_BUFFER , hHandle, iResolution, MAP_BORDER_X + MAP_BORDER_X_OFFSET + offsetX, MAP_BORDER_Y_OFFSET + offsetY, VO_BLT_SRCTRANSPARENCY,NULL );
InvalidateRegion( MAP_BORDER_X + MAP_BORDER_X_OFFSET + offsetX, MAP_BORDER_Y_OFFSET + offsetY, MAP_BORDER_X + MAP_BORDER_X_OFFSET + offsetX + 100 , MAP_BORDER_Y_OFFSET + offsetBorderY);
return;
Strategic/Map Screen Interface Map Inventory.cpp
+12
View File
@@ -542,6 +542,9 @@ void CreateDestroyMapInventoryPoolButtons( BOOLEAN fExitFromMapScreen )
// destroy buttons for map border
DeleteMapBorderButtons( );
// delete map level markers regions
DeleteMouseRegionsForLevelMarkers( );
fCreated = TRUE;
// also create the inventory slot
@@ -568,6 +571,9 @@ void CreateDestroyMapInventoryPoolButtons( BOOLEAN fExitFromMapScreen )
{
// recreate mapborder buttons
CreateButtonsForMapBorder( );
// recreate map level markers regions
CreateMouseRegionsForLevelMarkers( );
}
fCreated = FALSE;
@@ -1111,6 +1117,9 @@ void CreateMapInventoryButtons( void )
BUTTON_TOGGLE, MSYS_PRIORITY_HIGHEST,
(GUI_CALLBACK)BtnGenericMouseMoveButtonCallback, (GUI_CALLBACK)MapInventoryPoolPrevBtn );
// set up fast help text
SetButtonFastHelpText( guiMapInvenButton[ 0 ], pMapScreenInvenButtonHelpText[ 0 ] );
SetButtonFastHelpText( guiMapInvenButton[ 1 ], pMapScreenInvenButtonHelpText[ 1 ] );
//reset the current inventory page to be the first page
iCurrentInventoryPoolPage = 0;
@@ -1811,6 +1820,9 @@ void CreateMapInventoryPoolDoneButton( void )
BUTTON_TOGGLE, MSYS_PRIORITY_HIGHEST,
(GUI_CALLBACK)BtnGenericMouseMoveButtonCallback, (GUI_CALLBACK)MapInventoryPoolDoneBtn );
// set up fast help text
SetButtonFastHelpText( guiMapInvenButton[ 2 ], pMapScreenInvenButtonHelpText[ 2 ] );
return;
}
Strategic/Map Screen Interface Map.cpp
+2 -1
View File
@@ -64,6 +64,7 @@ UINT16 MAP_VIEW_START_Y;
UINT16 MAP_VIEW_WIDTH;
UINT16 MAP_VIEW_HEIGHT;
INT32 ETA_FONT;
INT32 MAP_FONT;
// x start of hort index
@@ -4653,7 +4654,7 @@ void DisplayDistancesForHelicopter( void )
// blit in background
GetVideoObject( &hHandle, guiMapBorderHeliSectors );
BltVideoObject( FRAME_BUFFER, hHandle, 0, MAP_HELICOPTER_ETA_POPUP_X, sYPosition, VO_BLT_SRCTRANSPARENCY, NULL );
BltVideoObject( FRAME_BUFFER, hHandle, iResolution, MAP_HELICOPTER_ETA_POPUP_X, sYPosition, VO_BLT_SRCTRANSPARENCY, NULL );
// sTotalCanTravel = ( INT16 )GetTotalDistanceHelicopterCanTravel( );
Strategic/Map Screen Interface Map.h
+1
View File
@@ -173,6 +173,7 @@ extern UINT16 MAP_VIEW_WIDTH;
extern UINT16 MAP_VIEW_HEIGHT;
extern INT32 MAP_FONT;
extern INT32 ETA_FONT;
extern UINT16 MAP_HORT_INDEX_X;
extern UINT16 MAP_HORT_INDEX_Y;
Strategic/mapscreen.cpp
+10 -4
View File
@@ -129,7 +129,8 @@
// Fonts
#define CHAR_FONT BLOCKFONT2 // COMPFONT
#define ETA_FONT BLOCKFONT2
//#define ETA_FONT BLOCKFONT2
// Colors
#define CHAR_INFO_PANEL_BLOCK_COLOR 60
@@ -4602,6 +4603,8 @@ UINT32 MapScreenHandle(void)
MAP_VERT_WIDTH = GetFontHeight(MAP_FONT);
ETA_FONT = BLOCKFONT2;
// Helicopter ETA box
MAP_HELICOPTER_ETA_POPUP_X = (400 + iScreenWidthOffset);
MAP_HELICOPTER_ETA_POPUP_Y = (250 + iScreenHeightOffset);
@@ -4644,6 +4647,8 @@ UINT32 MapScreenHandle(void)
MAP_VERT_INDEX_Y = (MAP_BORDER_Y + MAP_BORDER_Y_OFFSET + 36);
MAP_VERT_WIDTH = GetFontHeight(MAP_FONT);
ETA_FONT = BLOCKFONT2;
// Helicopter ETA box
MAP_HELICOPTER_ETA_POPUP_X = (400 + iScreenWidthOffset);
MAP_HELICOPTER_ETA_POPUP_Y = (250 + iScreenHeightOffset + 58);
@@ -4685,12 +4690,14 @@ UINT32 MapScreenHandle(void)
MAP_VERT_INDEX_Y = (MAP_BORDER_Y + MAP_BORDER_Y_OFFSET + 44);
MAP_VERT_WIDTH = GetFontHeight(MAP_FONT);
ETA_FONT = FONT12ARIAL;
// Helicopter ETA box
MAP_HELICOPTER_ETA_POPUP_X = (400 + iScreenWidthOffset);
MAP_HELICOPTER_ETA_POPUP_Y = (250 + iScreenHeightOffset + 140);
MAP_HELICOPTER_ETA_POPUP_Y = (250 + iScreenHeightOffset + 120);
MAP_HELICOPTER_UPPER_ETA_POPUP_Y = (50 + iScreenHeightOffset - 100);
MAP_HELICOPTER_ETA_POPUP_WIDTH = 120;
MAP_HELICOPTER_ETA_POPUP_HEIGHT = 68;
MAP_HELICOPTER_ETA_POPUP_HEIGHT = 76;
// Map Level string
MAP_LEVEL_STRING_X = (SCREEN_WIDTH - 208 - 187);
@@ -4873,7 +4880,6 @@ UINT32 MapScreenHandle(void)
CHECKF(AddVideoObject(&VObjectDesc, &guiMapBorderHeliSectors));
VObjectDesc.fCreateFlags = VOBJECT_CREATE_FROMFILE;
FilenameForBPP("INTERFACE\\secondary_gun_hidden.sti", VObjectDesc.ImageFile);
CHECKF( AddVideoObject( &VObjectDesc, &guiSecItemHiddenVO ) );