games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-11-06 09:09:40 +02:00
Code Issues Releases Activity

Merge branch 'feature/freegfx' into refactoring/guiClasses

Browse Source 
Conflicts:
	client/windows/CHeroWindow.cpp
	client/windows/CQuestLog.cpp
	client/windows/GUIClasses.cpp
This commit is contained in:
Ivan Savenko
2014-08-03 18:50:59 +03:00
parent 7390647cd5 9f5704f8ba
commit 77a73fbaa9
15 changed files with 32 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
client/windows/GUIClasses.cpp
View File

@@ -606,9 +606,8 @@ CSystemOptionsWindow::CSystemOptionsWindow():
onFullscreenChanged([&](const JsonNode &newState){ fullscreen->setSelected(newState.Bool());});
gameResButton = new CButton(Point(28, 275),"SYSOB12", CButton::tooltip(texts["resolutionButton"]),
boost::bind(&CSystemOptionsWindow::selectGameRes, this),
SDLK_g);
gameResButton = new CButton(Point(28, 275),"buttons/resolution", CButton::tooltip(texts["resolutionButton"]),
boost::bind(&CSystemOptionsWindow::selectGameRes, this), SDLK_g);
std::string resText;
resText += boost::lexical_cast<std::string>(settings["video"]["screenRes"]["width"].Float());