Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rftrdev merged 3 commits into from
Feb 22, 2023
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b0caca9
Replace widescreen checks with isWidescreenUI()
rftrdev Feb 22, 2023
c5e0d52
Force inventory panel redraw when changing selected merc
rftrdev Feb 22, 2023
e360fc6
Oops
rftrdev Feb 22, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Strategic/Map Screen Interface Border.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand Down
2 changes: 1 addition & 1 deletion Strategic/Map Screen Interface Bottom.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand Down
3 changes: 2 additions & 1 deletion Strategic/Map Screen Interface Map Inventory.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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");
}
Expand Down
4 changes: 2 additions & 2 deletions Strategic/Map Screen Interface Map.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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");
Expand Down Expand Up @@ -6717,7 +6717,7 @@ void HandleLowerLevelMapBlit( void )
offsetY = yVal;
imageIndex = 0;
}
else if (iResolution == _1280x720)
else if (isWidescreenUI())
{
offsetX = xVal + 21;
offsetY = yVal + 17;
Expand Down
7 changes: 4 additions & 3 deletions Strategic/mapscreen.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand All @@ -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);
}
Expand Down Expand Up @@ -15668,6 +15668,7 @@ void ChangeSelectedInfoChar( INT8 bCharNumber, BOOLEAN fResetSelectedList )
}

fCharacterInfoPanelDirty = TRUE;
fResetMapCoords = TRUE;

// if showing sector inventory
if ( fShowMapInventoryPool )
Expand Down Expand Up @@ -17968,4 +17969,4 @@ void initMapViewAndBorderCoordinates(void)
UI_MAP.HeliETA.Upper_Popup_Y = (50 + iScreenHeightOffset - 100);
UI_MAP.HeliETA.Alternate_Height = 97;
}
}
}
5 changes: 3 additions & 2 deletions Utils/message.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
#include "renderworld.h"
#include "local.h"
#include "interface.h"
#include "mapscreen.h"
#include "Map Screen Interface Bottom.h"
#include "WordWrap.h"
#include "Sound Control.h"
Expand Down Expand Up @@ -1036,7 +1037,7 @@ void MapScreenMessage( UINT16 usColor, UINT8 ubPriority, STR16 pStringA, ... )
// HEADROCK HAM 3.6: Allow for longer lines.
// Lejardo ARSProject
MAP_LINE_WIDTH = (INTERFACE_WIDTH - 330);
if (iResolution == _1280x720)
if (isWidescreenUI())
{
MAP_LINE_WIDTH = 685;
}
Expand Down Expand Up @@ -1129,7 +1130,7 @@ void DisplayStringsInMapScreenMessageList( void )
UINT16 usSpacing;
UINT16 MessageStartX = (SCREEN_WIDTH - INTERFACE_WIDTH) / 2;
UINT16 MessageEndX = MessageStartX + (INTERFACE_WIDTH - 330);
if (iResolution == _1280x720)
if (isWidescreenUI())
{
MessageStartX = 0;
MessageEndX = 705;
Expand Down