- 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
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
+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 ) );