diff options
author | Andrei Karas <akaras@inbox.ru> | 2015-08-10 14:35:08 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2015-08-10 15:07:44 +0300 |
commit | b77da1aadafb7879e14fdea0c63e5e11b7bf3361 (patch) | |
tree | 44f2ff125ed0c4b6d398c734142b6342a4997273 /src/dyetool | |
parent | 486fc09eb779c9265299a937486d98f9ab036219 (diff) | |
download | manaverse-b77da1aadafb7879e14fdea0c63e5e11b7bf3361.tar.gz manaverse-b77da1aadafb7879e14fdea0c63e5e11b7bf3361.tar.bz2 manaverse-b77da1aadafb7879e14fdea0c63e5e11b7bf3361.tar.xz manaverse-b77da1aadafb7879e14fdea0c63e5e11b7bf3361.zip |
Fix code style.
Diffstat (limited to 'src/dyetool')
-rw-r--r-- | src/dyetool/client.cpp | 21 | ||||
-rw-r--r-- | src/dyetool/client.h | 4 | ||||
-rw-r--r-- | src/dyetool/gui/viewport.cpp | 25 | ||||
-rw-r--r-- | src/dyetool/gui/viewport.h | 2 |
4 files changed, 2 insertions, 50 deletions
diff --git a/src/dyetool/client.cpp b/src/dyetool/client.cpp index 85cf216e2..a45054856 100644 --- a/src/dyetool/client.cpp +++ b/src/dyetool/client.cpp @@ -22,26 +22,14 @@ #include "client.h" -#include "chatlogger.h" #include "configmanager.h" #include "dirs.h" -#include "dropshortcut.h" -#include "emoteshortcut.h" #include "eventsmanager.h" -#include "game.h" #include "graphicsmanager.h" -#include "itemshortcut.h" -#include "party.h" #include "settings.h" #include "soundmanager.h" -#include "spellshortcut.h" -#include "statuseffect.h" -#include "units.h" #include "touchmanager.h" -#include "being/playerinfo.h" -#include "being/playerrelations.h" - #include "input/inputmanager.h" #include "input/joystick.h" #include "input/keyboardconfig.h" @@ -56,7 +44,6 @@ #include "gui/widgets/createwidget.h" #include "gui/widgets/desktop.h" #include "gui/widgets/windowcontainer.h" -#include "gui/widgets/window.h" #include "resources/imagehelper.h" #include "resources/resourcemanager.h" @@ -76,8 +63,6 @@ #include "utils/translation/translationmanager.h" -#include "listeners/errorlistener.h" - #include "configuration.h" #include "net/ipc.h" @@ -130,9 +115,7 @@ Client::Client() : mOldState(STATE_START), mSkin(nullptr), mButtonPadding(1), - mButtonSpacing(3), - mPing(0), - mConfigAutoSaved(false) + mButtonSpacing(3) { WindowManager::init(); } @@ -240,7 +223,7 @@ void Client::gameInit() ConfigManager::checkConfigVersion(); logVars(); Cpu::detect(); -#if defined(USE_OPENGL) +#if defined(USE_OPENGL) #if !defined(ANDROID) && !defined(__APPLE__) && !defined(__native_client__) if (!settings.options.safeMode && settings.options.test.empty() && !config.getBoolValue("videodetected")) diff --git a/src/dyetool/client.h b/src/dyetool/client.h index b0fb4229f..860df5cf2 100644 --- a/src/dyetool/client.h +++ b/src/dyetool/client.h @@ -27,8 +27,6 @@ #include "listeners/actionlistener.h" -#include "net/serverinfo.h" - #ifdef USE_SDL2 #include <SDL2_framerate.h> #else @@ -115,8 +113,6 @@ class Client final : public ActionListener Skin *mSkin; int mButtonPadding; int mButtonSpacing; - int mPing; - bool mConfigAutoSaved; }; extern Client *client; diff --git a/src/dyetool/gui/viewport.cpp b/src/dyetool/gui/viewport.cpp index 26de44a3a..6a19ab663 100644 --- a/src/dyetool/gui/viewport.cpp +++ b/src/dyetool/gui/viewport.cpp @@ -22,42 +22,17 @@ #include "gui/viewport.h" -#include "actormanager.h" #include "configuration.h" -#include "game.h" -#include "settings.h" #include "sdlshared.h" -#include "textmanager.h" - -#include "enums/resources/map/mapitemtype.h" - -#include "resources/map/map.h" -#include "resources/map/mapitem.h" -#include "resources/map/speciallayer.h" - -#include "being/localplayer.h" -#include "being/playerinfo.h" - -#include "input/inputmanager.h" #include "gui/gui.h" #include "gui/popupmanager.h" -#include "gui/userpalette.h" - -#include "gui/fonts/font.h" - -#include "gui/popups/beingpopup.h" -#include "gui/popups/popupmenu.h" -#include "gui/popups/textpopup.h" - -#include "gui/windows/ministatuswindow.h" #include "debug.h" Viewport *viewport = nullptr; extern volatile int tick_time; -extern MiniStatusWindow *miniStatusWindow; Viewport::Viewport() : WindowContainer(nullptr), diff --git a/src/dyetool/gui/viewport.h b/src/dyetool/gui/viewport.h index 12527d962..f3b042bd3 100644 --- a/src/dyetool/gui/viewport.h +++ b/src/dyetool/gui/viewport.h @@ -25,8 +25,6 @@ #include "position.h" -#include "enums/simpletypes/beingid.h" - #include "gui/widgets/windowcontainer.h" #include "listeners/mouselistener.h" |