summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2012-04-16 23:44:19 +0300
committerAndrei Karas <akaras@inbox.ru>2012-04-16 23:44:19 +0300
commit3fad572e788b31fb8311aa945e5b907d2974541a (patch)
tree0b3d6aa098928945603f8be10dd3b5f6c36c6676
parentfd71859df2d63d39e943b38f8aec2187afb09a85 (diff)
downloadmanaverse-3fad572e788b31fb8311aa945e5b907d2974541a.tar.gz
manaverse-3fad572e788b31fb8311aa945e5b907d2974541a.tar.bz2
manaverse-3fad572e788b31fb8311aa945e5b907d2974541a.tar.xz
manaverse-3fad572e788b31fb8311aa945e5b907d2974541a.zip
Fix code style.
-rw-r--r--src/client.cpp2
-rw-r--r--src/gui/setupactiondata.h5
2 files changed, 6 insertions, 1 deletions
diff --git a/src/client.cpp b/src/client.cpp
index 2efbac659..bbb65a05c 100644
--- a/src/client.cpp
+++ b/src/client.cpp
@@ -385,8 +385,8 @@ void Client::gameInit()
"Exiting.", mLocalDataDir.c_str()));
}
- Image::setBlur(config.getBoolValue("blur"));
#if defined USE_OPENGL
+ Image::setBlur(config.getBoolValue("blur"));
Image::SDLSetEnableAlphaCache(config.getBoolValue("alphaCache")
&& !config.getIntValue("opengl"));
Image::setEnableAlpha(config.getFloatValue("guialpha") != 1.0f
diff --git a/src/gui/setupactiondata.h b/src/gui/setupactiondata.h
index c1cdbf379..af0b25cfb 100644
--- a/src/gui/setupactiondata.h
+++ b/src/gui/setupactiondata.h
@@ -24,7 +24,12 @@
#ifndef GUI_SETUPACTIONDATA_H
#define GUI_SETUPACTIONDATA_H
+#include "keydata.h"
+
#include "utils/gettext.h"
+#include "utils/stringutils.h"
+
+#include <string>
#include "debug.h"