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

Redraw inventory panel when changing selected merc in strategic view (#127)

Browse Source
This commit is contained in:
rftrdev
2023-02-21 23:22:30 -08:00
committed by GitHub
parent e1f7fa7bfb
commit ff360153c7
6 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Strategic/Map Screen Interface Border.cpp
+1 -1
View File
@@ -124,7 +124,7 @@ BOOLEAN LoadMapBorderGraphics( void )
{
FilenameForBPP( "INTERFACE\\MBS.sti", VObjectDesc.ImageFile );
}
else if (iResolution == _1280x720)
else if (isWidescreenUI())
{
FilenameForBPP("INTERFACE\\MBS_1280x720.sti", VObjectDesc.ImageFile);
}
Strategic/Map Screen Interface Bottom.cpp
+1 -1
View File
@@ -266,7 +266,7 @@ void HandleLoadOfMapBottomGraphics( void )
{
FilenameForBPP( "INTERFACE\\map_screen_bottom.sti", VObjectDesc.ImageFile );
}
else if (iResolution == _1280x720)
else if (isWidescreenUI())
{
FilenameForBPP("INTERFACE\\map_screen_bottom_1280x720.sti", VObjectDesc.ImageFile);
}
Strategic/Map Screen Interface Map Inventory.cpp
+2 -1
View File
@@ -40,6 +40,7 @@
#include "Interface Items.h"
#include "Food.h" // added by Flugente
#include "Campaign Types.h" // added by Flugente
#include "mapscreen.h"
//forward declarations of common classes to eliminate includes
class OBJECTTYPE;
@@ -448,7 +449,7 @@ BOOLEAN LoadInventoryPoolGraphic( void )
{
sprintf( VObjectDesc.ImageFile, "INTERFACE\\sector_inventory.sti" );
}
else if (iResolution == _1280x720)
else if (isWidescreenUI())
{
sprintf(VObjectDesc.ImageFile, "INTERFACE\\sector_inventory_1280x720.sti");
}
Strategic/Map Screen Interface Map.cpp
+2 -2
View File
@@ -1819,7 +1819,7 @@ BOOLEAN InitializePalettesForMap( void )
if (iResolution >= _640x480 && iResolution < _800x600)
strcpy(vs_desc.ImageFile, "INTERFACE\\b_map.pcx");
else if (iResolution == _1280x720)
else if (isWidescreenUI())
strcpy(vs_desc.ImageFile, "INTERFACE\\b_map_1280x720.pcx");
else if (iResolution < _1024x768)
strcpy(vs_desc.ImageFile, "INTERFACE\\b_map_800x600.pcx");
@@ -6717,7 +6717,7 @@ void HandleLowerLevelMapBlit( void )
offsetY = yVal;
imageIndex = 0;
}
else if (iResolution == _1280x720)
else if (isWidescreenUI())
{
offsetX = xVal + 21;
offsetY = yVal + 17;
Strategic/mapscreen.cpp
+3 -2
View File
@@ -4952,7 +4952,7 @@ UINT32 MapScreenHandle(void)
VObjectDesc.fCreateFlags=VOBJECT_CREATE_FROMFILE;
if (!is_networked)
{
if (iResolution == _1280x720)
if (isWidescreenUI())
{
FilenameForBPP("INTERFACE\\newgoldpiece3_1280x720.sti", VObjectDesc.ImageFile);
}
@@ -4972,7 +4972,7 @@ UINT32 MapScreenHandle(void)
else
{
// OJW - 20081204 - change mapscreen interface for MP games
if (iResolution == _1280x720)
if (isWidescreenUI())
{
FilenameForBPP("INTERFACE\\mpgoldpiece3_1280x720.sti", VObjectDesc.ImageFile);
}
@@ -15668,6 +15668,7 @@ void ChangeSelectedInfoChar( INT8 bCharNumber, BOOLEAN fResetSelectedList )
}
fCharacterInfoPanelDirty = TRUE;
fResetMapCoords = TRUE;
// if showing sector inventory
if ( fShowMapInventoryPool )