diff options
author | Thorbjørn Lindeijer <bjorn@lindeijer.nl> | 2024-03-12 13:24:16 +0100 |
---|---|---|
committer | Thorbjørn Lindeijer <bjorn@lindeijer.nl> | 2024-03-12 21:23:10 +0100 |
commit | 306ad2effe4d0897453e61ad787e01dc47c33076 (patch) | |
tree | 75b8b291af55e80d01d9eb85afd7d465233a1a57 /src/game.cpp | |
parent | 66599a9896e0cf69b58c0a73152aba4750d87af2 (diff) | |
download | mana-306ad2effe4d0897453e61ad787e01dc47c33076.tar.gz mana-306ad2effe4d0897453e61ad787e01dc47c33076.tar.bz2 mana-306ad2effe4d0897453e61ad787e01dc47c33076.tar.xz mana-306ad2effe4d0897453e61ad787e01dc47c33076.zip |
General code cleanups
* Use default member initializers
* Use range-based for loops
* Avoid needless pointer references for ShopItem::mDuplicates
* Removed type aliases that are only used once or twice
* Removed more unused includes
* Removed some unused functions
* Removed superfluous .c_str()
* Rely on default copy and assignment operators for Vector class
* Use std::unique_ptr in some places
* Removed duplicated mPlayerMoney updating in SellDialog
* Removed duplicated Game::handleInput call
* Removed unused SDLInput::mMouseInWindow
* Removed remnant of manual widget positioning in HelpWindow
* Removed superfluous initialization of static pointers
Diffstat (limited to 'src/game.cpp')
-rw-r--r-- | src/game.cpp | 24 |
1 files changed, 11 insertions, 13 deletions
diff --git a/src/game.cpp b/src/game.cpp index e27e6f5d..b7cc02fe 100644 --- a/src/game.cpp +++ b/src/game.cpp @@ -88,11 +88,11 @@ #include <sstream> #include <string> -Joystick *joystick = nullptr; +Joystick *joystick; -OkDialog *weightNotice = nullptr; -OkDialog *deathNotice = nullptr; -QuitDialog *quitDialog = nullptr; +OkDialog *weightNotice; +OkDialog *deathNotice; +QuitDialog *quitDialog; ChatWindow *chatWindow; StatusWindow *statusWindow; @@ -110,14 +110,14 @@ OutfitWindow *outfitWindow; SpecialsWindow *specialsWindow; SocialWindow *socialWindow; -ActorSpriteManager *actorSpriteManager = nullptr; -ChannelManager *channelManager = nullptr; -CommandHandler *commandHandler = nullptr; -Particle *particleEngine = nullptr; -EffectManager *effectManager = nullptr; -Viewport *viewport = nullptr; /**< Viewport on the map. */ +ActorSpriteManager *actorSpriteManager; +ChannelManager *channelManager; +CommandHandler *commandHandler; +Particle *particleEngine; +EffectManager *effectManager; +Viewport *viewport; /**< Viewport on the map. */ -ChatTab *localChatTab = nullptr; +ChatTab *localChatTab; /** * Initialize every game sub-engines in the right order @@ -338,8 +338,6 @@ static bool saveScreenshot() void Game::logic() { - handleInput(); - // Handle all necessary game logic ActorSprite::actorLogic(); actorSpriteManager->logic(); |