From 1d509e4d8a5598e058003c0c4514c9eb3874105a Mon Sep 17 00:00:00 2001 From: Wanne Date: Sun, 2 Oct 2011 18:59:13 +0000 Subject: [PATCH] - Fix for Map Sector Inv keyboard shortcut (by Buggler) 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 --- Strategic/Map Screen Interface Border.cpp | 3 ++- Strategic/Map Screen Interface Map Inventory.cpp | 12 ++++++++++++ Strategic/Map Screen Interface Map.cpp | 3 ++- Strategic/Map Screen Interface Map.h | 1 + Strategic/mapscreen.cpp | 14 ++++++++++---- 5 files changed, 27 insertions(+), 6 deletions(-) diff --git a/Strategic/Map Screen Interface Border.cpp b/Strategic/Map Screen Interface Border.cpp index 07d400182..5181a5770 100644 --- a/Strategic/Map Screen Interface Border.cpp +++ b/Strategic/Map Screen Interface Border.cpp @@ -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; diff --git a/Strategic/Map Screen Interface Map Inventory.cpp b/Strategic/Map Screen Interface Map Inventory.cpp index de1f799c5..55ae2213e 100644 --- a/Strategic/Map Screen Interface Map Inventory.cpp +++ b/Strategic/Map Screen Interface Map Inventory.cpp @@ -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; } diff --git a/Strategic/Map Screen Interface Map.cpp b/Strategic/Map Screen Interface Map.cpp index d7c5488fb..23f523107 100644 --- a/Strategic/Map Screen Interface Map.cpp +++ b/Strategic/Map Screen Interface Map.cpp @@ -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( ); diff --git a/Strategic/Map Screen Interface Map.h b/Strategic/Map Screen Interface Map.h index 02a026aa5..e06b61c23 100644 --- a/Strategic/Map Screen Interface Map.h +++ b/Strategic/Map Screen Interface Map.h @@ -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; diff --git a/Strategic/mapscreen.cpp b/Strategic/mapscreen.cpp index 80eddb620..049960ef9 100644 --- a/Strategic/mapscreen.cpp +++ b/Strategic/mapscreen.cpp @@ -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 ) );