From 306ad2effe4d0897453e61ad787e01dc47c33076 Mon Sep 17 00:00:00 2001
From: Thorbjørn Lindeijer <bjorn@lindeijer.nl>
Date: Tue, 12 Mar 2024 13:24:16 +0100
Subject: 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
---
 src/game.cpp | 24 +++++++++++-------------
 1 file changed, 11 insertions(+), 13 deletions(-)

(limited to 'src/game.cpp')

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();
-- 
cgit v1.2.3-60-g2f50