speed-dreams/speed-dreams-code
6
1
Fork 1
Code Issues 9 Pull requests Projects Releases Packages Wiki Activity Actions

Fixed forgotten bBump argument in call to checkBestSupport

Browse source 
git-svn-id: https://svn.code.sf.net/p/speed-dreams/code/trunk@4787 30fe4595-0a0c-4342-8851-515496e4dcbd

Former-commit-id: 93066ea4c4d94e7ac2cd92b13bdcd9ad899732d6
Former-commit-id: c8cf86c64a18bb48e3b87e2254094b01299b02e1
This commit is contained in:
pouillot 2012-07-03 17:16:51 +00:00
parent 67c9c5b3a1
commit 5619b1e85f
2 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/libs/tgfclient/glfeatures.cpp
View file

@ -617,7 +617,7 @@ bool GfglFeatures::checkBestSupport(int nWidth, int nHeight, int nDepth,
// and run a new supported feature detection if any diffference. // and run a new supported feature detection if any diffference.
bool bSupportFound = true; bool bSupportFound = true;
if (!bPrevSupportFound || nWidth != nDetWidth || nHeight != nDetHeight || nDepth != nDetDepth if (!bPrevSupportFound || nWidth != nDetWidth || nHeight != nDetHeight || nDepth != nDetDepth
|| bAlpha != bDetAlpha || bFullScreen != bDetFullScreen || bStereo != bDetStereo) || bAlpha != bDetAlpha || bFullScreen != bDetFullScreen || bStereo != bDetStereo || bBump != bDetBump)
{ {
nDetWidth = nWidth; nDetWidth = nWidth;
nDetHeight = nHeight; nDetHeight = nHeight;

6
src/libs/tgfclient/guiscreen.cpp
View file

@ -435,6 +435,10 @@ bool GfScrInit(int nWinWidth, int nWinHeight, int nFullScreen)
== GFSCR_VAL_YES; == GFSCR_VAL_YES;
else else
bFullScreen = nFullScreen ? true : false; bFullScreen = nFullScreen ? true : false;
bool bBumpMap =
std::string(GfParmGetStr(hparmScreen, pszScrPropSec, GFSCR_ATT_BUMPMAPPING,
GFSCR_VAL_NO))
== GFSCR_VAL_YES;
bool bStereo = bool bStereo =
std::string(GfParmGetStr(hparmScreen, pszScrPropSec, GFSCR_ATT_STEREOVISION, std::string(GfParmGetStr(hparmScreen, pszScrPropSec, GFSCR_ATT_STEREOVISION,
GFSCR_VAL_YES)) GFSCR_VAL_YES))
@ -459,7 +463,7 @@ bool GfScrInit(int nWinWidth, int nWinHeight, int nFullScreen)
// Warning: Restarts the game if the frame buffer specs changed since last call. // Warning: Restarts the game if the frame buffer specs changed since last call.
// If specified and possible, setup the best possible settings. // If specified and possible, setup the best possible settings.
if (GfglFeatures::self().checkBestSupport(nWinWidth, nWinHeight, nTotalDepth, if (GfglFeatures::self().checkBestSupport(nWinWidth, nWinHeight, nTotalDepth,
bAlphaChannel, bFullScreen, bStereo, hparmScreen)) bAlphaChannel, bFullScreen, bBumpMap, bStereo, hparmScreen))
{ {
// Load Open GL user settings from the config file. // Load Open GL user settings from the config file.
GfglFeatures::self().loadSelection(); GfglFeatures::self().loadSelection();