marko10_000
/
openclonk
forked from Mirrors/openclonk
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Check for valid resolution on startup 

If the configuration file specifies a resolution the driver doesn't support,
choose one with a similar area. This resolves issue #16.
stable-5.2
Nicolas Hake 2009-07-03 02:20:28 +02:00
parent 8466407a60
commit 8065c40ce3
2 changed files with 32 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
engine/inc/C4Config.h
View File

@ -144,6 +144,7 @@ class C4ConfigGraphics
int32_t FireParticles; // draw extended fire particles if enabled (defualt on)
int32_t MaxRefreshDelay; // minimum time after which graphics should be refreshed (ms)
void CompileFunc(StdCompiler *pComp);
void ApplyResolutionConstraints();
};
class C4ConfigSound

31
engine/src/C4Config.cpp
View File

@ -507,6 +507,7 @@ BOOL C4Config::Load(BOOL forceWorkingDirectory, const char *szConfigFile)
#endif
// OpenGL
DDrawCfg.Set(Graphics.NewGfxCfgGL, (float) Graphics.BlitOffGL/100.0f);
Graphics.ApplyResolutionConstraints();
// Warning against invalid ports
if (Config.Network.PortTCP>0 && Config.Network.PortTCP == Config.Network.PortRefServer)
{
@ -594,6 +595,36 @@ BOOL C4Config::Save()
return TRUE;
}
void C4ConfigGraphics::ApplyResolutionConstraints()
{
// Enumerate display modes
int32_t idx = 0, iXRes, iYRes, iBitDepth;
int32_t best_match = -1;
uint32_t best_delta = ~0;
while (Application.GetIndexedDisplayMode(idx++, &iXRes, &iYRes, &iBitDepth, Config.Graphics.Monitor))
{
uint32_t delta = std::abs(ResX*ResY - iXRes*iYRes);
if (!delta && iBitDepth == BitDepth)
return; // Exactly the expected mode
if (delta < best_delta)
{
// Better match than before
best_match = idx;
best_delta = delta;
}
}
if (best_match != -1)
{
// Apply next-best mode
Application.GetIndexedDisplayMode(best_match, &iXRes, &iYRes, &iBitDepth, Config.Graphics.Monitor);
if (iXRes != ResX || iYRes != ResY)
// Don't warn if only bit depth changes
// Also, lang table not loaded yet
LogF("Warning: The selected resolution %dx%d is not available and has been changed to %dx%d.", ResX, ResY, iXRes, iYRes);
ResX = iXRes; ResY = iYRes;
}
}
void C4ConfigGeneral::DeterminePaths(BOOL forceWorkingDirectory)
{
#ifdef _WIN32