diff options
author | Andrei Karas <akaras@inbox.ru> | 2014-07-28 20:06:51 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2014-07-28 20:06:51 +0300 |
commit | 3b8a3b84346700abffa52745245310bf3eae6b18 (patch) | |
tree | dfe8c94d73da7fc3a350017f1905f3e25b5ec5e0 /src/client.h | |
parent | 1c1860cf83ba5d504b69c0ebd737139c8ab1bd46 (diff) | |
download | manaplus-3b8a3b84346700abffa52745245310bf3eae6b18.tar.gz manaplus-3b8a3b84346700abffa52745245310bf3eae6b18.tar.bz2 manaplus-3b8a3b84346700abffa52745245310bf3eae6b18.tar.xz manaplus-3b8a3b84346700abffa52745245310bf3eae6b18.zip |
Fix formating in other files.
Diffstat (limited to 'src/client.h')
-rw-r--r-- | src/client.h | 94 |
1 files changed, 47 insertions, 47 deletions
diff --git a/src/client.h b/src/client.h index 6dff50877..23bc7c0b2 100644 --- a/src/client.h +++ b/src/client.h @@ -68,86 +68,86 @@ extern LoginData loginData; class Client final : public ConfigListener, public ActionListener { -public: - Client(); + public: + Client(); - A_DELETE_COPY(Client) + A_DELETE_COPY(Client) - ~Client(); + ~Client(); - void gameInit(); + void gameInit(); - void testsInit(); + void testsInit(); - int gameExec(); + int gameExec(); - static int testsExec(); + static int testsExec(); - void setState(const State state) - { mState = state; } + void setState(const State state) + { mState = state; } - State getState() const A_WARN_UNUSED - { return mState; } + State getState() const A_WARN_UNUSED + { return mState; } - static bool isTmw() A_WARN_UNUSED; + static bool isTmw() A_WARN_UNUSED; - void optionChanged(const std::string &name) override final; + void optionChanged(const std::string &name) override final; - void action(const ActionEvent &event) override final; + void action(const ActionEvent &event) override final; - static void initTradeFilter(); + static void initTradeFilter(); - void moveButtons(const int width); + void moveButtons(const int width); - void windowRemoved(const Window *const window); + void windowRemoved(const Window *const window); - static void setEnv(const char *const name, const char *const value); + static void setEnv(const char *const name, const char *const value); -private: - void initSoundManager(); + private: + void initSoundManager(); - void initConfigListeners(); + void initConfigListeners(); - static void initGraphics(); + static void initGraphics(); - static void updateEnv(); + static void updateEnv(); - static void initFeatures(); + static void initFeatures(); - void gameClear(); + void gameClear(); - void testsClear(); + void testsClear(); - static void logVars(); + static void logVars(); #ifdef ANDROID #ifdef USE_SDL2 - static void extractAssets(); + static void extractAssets(); #endif #endif - ServerInfo mCurrentServer; - - Game *mGame; - Window *mCurrentDialog; - QuitDialog *mQuitDialog; - Button *mSetupButton; - Button *mVideoButton; - Button *mHelpButton; - Button *mAboutButton; - Button *mThemesButton; - Button *mPerfomanceButton; + ServerInfo mCurrentServer; + + Game *mGame; + Window *mCurrentDialog; + QuitDialog *mQuitDialog; + Button *mSetupButton; + Button *mVideoButton; + Button *mHelpButton; + Button *mAboutButton; + Button *mThemesButton; + Button *mPerfomanceButton; #ifdef ANDROID - Button *mCloseButton; + Button *mCloseButton; #endif - State mState; - State mOldState; + State mState; + State mOldState; - Skin *mSkin; - int mButtonPadding; - int mButtonSpacing; - bool mConfigAutoSaved; + Skin *mSkin; + int mButtonPadding; + int mButtonSpacing; + bool mConfigAutoSaved; }; extern Client *client; |