diff options
author | Thorbjørn Lindeijer <bjorn@lindeijer.nl> | 2024-03-05 10:13:15 +0100 |
---|---|---|
committer | Thorbjørn Lindeijer <bjorn@lindeijer.nl> | 2024-03-06 21:49:14 +0000 |
commit | 3ce39d2b497ab5356290a22b324181386af51c51 (patch) | |
tree | 1b923b8be7e4d2ce8ff70768dc7fff596487935c /src/client.h | |
parent | a9df89bda908e3b3d443db7f3ca865b6f12c75e5 (diff) | |
download | mana-3ce39d2b497ab5356290a22b324181386af51c51.tar.gz mana-3ce39d2b497ab5356290a22b324181386af51c51.tar.bz2 mana-3ce39d2b497ab5356290a22b324181386af51c51.tar.xz mana-3ce39d2b497ab5356290a22b324181386af51c51.zip |
General code cleanups
* Use final for all message handlers, Client, LocalPlayer,
Being::getType, Being::setPosition and Being::setMap.
(avoids some warnings about virtual dispatch in constructors)
* Use auto in more places
* Use emplace_back instead of push_back in some places
* Use default member initializers
* Less else after return
* Removed superfluous .c_str()
* Removed type aliases that are only used once
* Removed more unused includes
Diffstat (limited to 'src/client.h')
-rw-r--r-- | src/client.h | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/src/client.h b/src/client.h index dfcc3e70..5b88dd5a 100644 --- a/src/client.h +++ b/src/client.h @@ -121,7 +121,7 @@ enum State { * The core part of the client. This class initializes all subsystems, runs * the event loop, and shuts everything down again. */ -class Client : public EventListener, public gcn::ActionListener +class Client final : public EventListener, public gcn::ActionListener { public: /** @@ -234,22 +234,22 @@ private: ServerInfo mCurrentServer; Video mVideo; - Game *mGame; - Window *mCurrentDialog; - QuitDialog *mQuitDialog; - Desktop *mDesktop; - Button *mSetupButton; + Game *mGame = nullptr; + Window *mCurrentDialog = nullptr; + QuitDialog *mQuitDialog = nullptr; + Desktop *mDesktop = nullptr; + Button *mSetupButton = nullptr; - State mState; - State mOldState; + State mState = STATE_CHOOSE_SERVER; + State mOldState = STATE_START; State mStateAfterOkDialog; - SDL_Surface *mIcon; + SDL_Surface *mIcon = nullptr; - SDL_TimerID mLogicCounterId; - SDL_TimerID mSecondsCounterId; + SDL_TimerID mLogicCounterId = 0; + SDL_TimerID mSecondsCounterId = 0; - bool mLimitFps; + bool mLimitFps = false; FPSmanager mFpsManager; }; |