zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2024-11-14 08:31:23 +00:00
Code Issues Projects Releases Packages Wiki Activity

- The SBarInfo AspectRatio command should treat 17:10 ratios as 16:10 for better compatibility with existing status bars unless the statusbar explicitly checks for it.

Browse source 
SVN r3663 (trunk)
This commit is contained in:
Braden Obrzut 2012-05-19 08:44:58 +00:00
parent e62e806693
commit 4753be45fc
1 changed files with 13 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/g_shared/sbarinfo_commands.cpp
View file

@ -1748,13 +1748,19 @@ class CommandAspectRatio : public SBarInfoCommandFlowControl
ratio = ASPECTRATIO_5_4; ratio = ASPECTRATIO_5_4;
else else
sc.ScriptError("Unkown aspect ratio: %s", sc.String); sc.ScriptError("Unkown aspect ratio: %s", sc.String);
// Make this ratio known and map to itself
// In the future, should another aspect ratio get added, you'd want
// to also make any wider ratio remap to this one if suitable.
ratioMap[ratio] = ratio;
SBarInfoCommandFlowControl::Parse(sc, fullScreenOffsets); SBarInfoCommandFlowControl::Parse(sc, fullScreenOffsets);
} }
void Tick(const SBarInfoMainBlock *block, const DSBarInfo *statusBar, bool hudChanged) void Tick(const SBarInfoMainBlock *block, const DSBarInfo *statusBar, bool hudChanged)
{ {
SBarInfoCommandFlowControl::Tick(block, statusBar, hudChanged); SBarInfoCommandFlowControl::Tick(block, statusBar, hudChanged);
SetTruth(CheckRatio(screen->GetWidth(), screen->GetHeight()) == ratio, block, statusBar); SetTruth(ratioMap[CheckRatio(screen->GetWidth(), screen->GetHeight())] == ratio, block, statusBar);
} }
protected: protected:
enum Ratio enum Ratio
@ -1765,9 +1771,14 @@ class CommandAspectRatio : public SBarInfoCommandFlowControl
ASPECTRATIO_17_10 = 3, ASPECTRATIO_17_10 = 3,
ASPECTRATIO_5_4 = 4 ASPECTRATIO_5_4 = 4
}; };
// Since the number of aspect ratios may change at any time, we should
// track what aspect ratios the statusbar supports and use the widest
// or tallest available ratio.
static Ratio ratioMap[5];
Ratio ratio; Ratio ratio;
}; };
CommandAspectRatio::Ratio CommandAspectRatio::ratioMap[5] = {ASPECTRATIO_4_3,ASPECTRATIO_16_9,ASPECTRATIO_16_10,ASPECTRATIO_16_10,ASPECTRATIO_5_4};
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////