-
Notifications
You must be signed in to change notification settings - Fork 21
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.
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
Battle Panel Multi Resolution #203
Conversation
This looks great! One thing I did notice, is that it's not taking into account localized versions of prebattlepanel graphics. For example, in German version, the panel column titles are not replaced by graphics from Data\german\PREBATTLEPANEL_GERMAN.sti Same thing happens with the other languages as well. |
Strategic/PreBattle Interface.cpp
Outdated
@@ -482,31 +495,70 @@ void InitPreBattleInterface( GROUP *pBattleGroup, BOOLEAN fPersistantPBI ) | |||
fMapScreenBottomDirty = TRUE; | |||
ChangeSelectedMapSector( gubPBSectorX, gubPBSectorY, gubPBSectorZ ); | |||
// Headrock: Added FALSE argument, We might need TRUE but not sure. Will need to initiate battle :) | |||
RenderMapScreenInterfaceBottom( FALSE ); | |||
//RenderMapScreenInterfaceBottom( FALSE ); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
If this function call is no longer needed, simply delete it and the accompanying comment related to it. There's plenty of old, commented out code in the repo. We don't need to add to it :)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Cool cool, deleted.
Localization: 1dot13/gamedir-languages#10
BTW looks like Dutch PREBATTLEPANEL_DUTCH.STI was already only in English, so I just added other resolution variants also in English for Dutch in PR.
@@ -203,6 +212,15 @@ BOOLEAN GetMLGFilename( SGPFILENAME filename, UINT16 usMLGGraphicID ) | |||
case MLG_PREBATTLEPANEL: | |||
sprintf( filename, "GERMAN\\PreBattlePanel_german.sti" ); | |||
return TRUE; | |||
case MLG_PREBATTLEPANEL_800x600: | |||
sprintf(filename, "INTERFACE\\PreBattlePanel_800x600_german.sti"); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The correct path should be GERMAN\PreBattlePanel_800x600_german.sti, similar to the original prebattle sti file. Right now the game will error out on the assert at line 546 in PreBattle Interface.cpp as it fails to fails to find the file on higher resolutions
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks, resolved
Battle panel in different variants for each main vertical resolution and 720 widescreen.
If there's not enough space to display all mercs due to increased limits compared to vanilla, mercs will be displayed page by page, scrollable with Page Up/Page Down (similar to the team assignments panel).
Related fixes:
Comparison:
640x480


1280x720 Widescreen


1024x768


720 Widescreen - Auto-resolve fix


Transition fix


Corresponding gamedir PR:
1dot13/gamedir#46