diff options
| author | Andrei Karas <akaras@inbox.ru> | 2013-11-08 14:52:18 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2013-11-08 14:52:18 +0300 |
| commit | 5564df0ae67373da8ffb148fde95fdd9142c870b (patch) | |
| tree | 59ae99399e3392922cacbd8dfd0136a8738ea8a2 | |
| parent | 64535f9763c432bbb46be2769560bfd6a2202d72 (diff) | |
| download | mv-5564df0ae67373da8ffb148fde95fdd9142c870b.tar.gz mv-5564df0ae67373da8ffb148fde95fdd9142c870b.tar.bz2 mv-5564df0ae67373da8ffb148fde95fdd9142c870b.tar.xz mv-5564df0ae67373da8ffb148fde95fdd9142c870b.zip | |
fix code style.
| -rw-r--r-- | src/graphicsmanager.cpp | 10 | ||||
| -rw-r--r-- | src/gui/windows/editdialog.cpp | 2 | ||||
| -rw-r--r-- | src/net/netconsts.h | 7 | ||||
| -rw-r--r-- | src/utils/files.cpp | 6 | ||||
| -rw-r--r-- | src/utils/xml.cpp | 2 |
5 files changed, 15 insertions, 12 deletions
diff --git a/src/graphicsmanager.cpp b/src/graphicsmanager.cpp index c6c36d15d..ace00663e 100644 --- a/src/graphicsmanager.cpp +++ b/src/graphicsmanager.cpp @@ -365,9 +365,13 @@ void GraphicsManager::setVideoMode() int width = res[0]; int height = res[1]; #elif defined __native_client__ - const SDL_VideoInfo* info = SDL_GetVideoInfo(); - int width = info->current_w; - int height = info->current_h; +#ifdef USE_SDL2 + // not implimented +#else + const SDL_VideoInfo* info = SDL_GetVideoInfo(); + int width = info->current_w; + int height = info->current_h; +#endif #else int width = config.getIntValue("screenwidth"); int height = config.getIntValue("screenheight"); diff --git a/src/gui/windows/editdialog.cpp b/src/gui/windows/editdialog.cpp index 05f55ad67..a4711784e 100644 --- a/src/gui/windows/editdialog.cpp +++ b/src/gui/windows/editdialog.cpp @@ -26,8 +26,6 @@ #include "utils/gettext.h" -#include <guichan/font.hpp> - #include "debug.h" EditDialog::EditDialog(const std::string &title, const std::string &msg, diff --git a/src/net/netconsts.h b/src/net/netconsts.h index 38f84ebaa..0af23b8a9 100644 --- a/src/net/netconsts.h +++ b/src/net/netconsts.h @@ -18,9 +18,10 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef NET_DEFAULTS_H -#define NET_DEFAULTS_H +#ifndef NET_NETCONSTS_H +#define NET_NETCONSTS_H +#include <cstdint> static const uint16_t DEFAULT_PORT = 6901; -#endif // NET_DEFAULTS_H +#endif // NET_NETCONSTS_H diff --git a/src/utils/files.cpp b/src/utils/files.cpp index bfaed472a..15b667ba8 100644 --- a/src/utils/files.cpp +++ b/src/utils/files.cpp @@ -20,12 +20,12 @@ #include "utils/files.h" -#include "logger.h" - +#if defined(ANDROID) || defined(__native_client__) #include "resources/resourcemanager.h" +#include "utils/physfstools.h" +#endif #include "utils/mkdir.h" -#include "utils/physfstools.h" #include "localconsts.h" diff --git a/src/utils/xml.cpp b/src/utils/xml.cpp index 60b4505c5..b87418079 100644 --- a/src/utils/xml.cpp +++ b/src/utils/xml.cpp @@ -44,7 +44,7 @@ static void xmlErrorLogger(void *ctx A_UNUSED, const char *msg A_UNUSED, ...) #endif ; -static void xmlErrorLogger(void *ctx A_UNUSED, const char *msg A_UNUSED, ...) +static void xmlErrorLogger(void *ctx A_UNUSED, const char *msg, ...) { unsigned size = 1024; const unsigned msgSize = strlen(msg); |