summaryrefslogtreecommitdiff
path: root/src/graphicsmanager.cpp
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2014-01-29 00:55:06 +0300
committerAndrei Karas <akaras@inbox.ru>2014-01-29 00:55:06 +0300
commitdbc30204cae020ff0be41fb8f20bbb3a531686b3 (patch)
tree844ffa7b47c576ca93631020665a92af08603c25 /src/graphicsmanager.cpp
parentb9b358dc0d5c268a923c3a961ac8c072ccc691cf (diff)
downloadmv-dbc30204cae020ff0be41fb8f20bbb3a531686b3.tar.gz
mv-dbc30204cae020ff0be41fb8f20bbb3a531686b3.tar.bz2
mv-dbc30204cae020ff0be41fb8f20bbb3a531686b3.tar.xz
mv-dbc30204cae020ff0be41fb8f20bbb3a531686b3.zip
allow apply scale without client restart.
Diffstat (limited to 'src/graphicsmanager.cpp')
-rw-r--r--src/graphicsmanager.cpp12
1 files changed, 1 insertions, 11 deletions
diff --git a/src/graphicsmanager.cpp b/src/graphicsmanager.cpp
index 0a7f78eb6..00cceb22f 100644
--- a/src/graphicsmanager.cpp
+++ b/src/graphicsmanager.cpp
@@ -376,17 +376,7 @@ void GraphicsManager::setVideoMode()
int width = config.getIntValue("screenwidth");
int height = config.getIntValue("screenheight");
#endif
-
- int scale = 1;
- if (mainGraphics->allowScale())
- {
- if (!scale)
- scale = 1;
- scale = config.getIntValue("scale");
- if (width / scale < 470 || height / scale < 320)
- scale = 1;
- logger->log("set scale: %d", scale);
- }
+ const int scale = config.getIntValue("scale");
// Try to set the desired video mode
if (!mainGraphics->setVideoMode(width, height, scale, bpp,