From 4406d89743edf6ee8c97bfa87442b02d60196868 Mon Sep 17 00:00:00 2001
From: Eugene Sandulenko
Date: Thu, 8 Aug 2019 00:05:02 +0200
Subject: HDB: Move heavy lifting out of HDBGame constructor

---
 engines/hdb/hdb.cpp | 32 ++++++++++++++++++++++----------
 1 file changed, 22 insertions(+), 10 deletions(-)

diff --git a/engines/hdb/hdb.cpp b/engines/hdb/hdb.cpp
index f620bd378c..f64ef4e22e 100644
--- a/engines/hdb/hdb.cpp
+++ b/engines/hdb/hdb.cpp
@@ -44,6 +44,7 @@ namespace HDB {
 HDBGame* g_hdb;
 
 HDBGame::HDBGame(OSystem *syst, const ADGameDescription *gameDesc) : Engine(syst), _gameDescription(gameDesc) {
+	g_hdb = this;
 	if (isPPC()) {
 		_screenWidth = 240;
 		_screenHeight = 320;
@@ -60,16 +61,16 @@ HDBGame::HDBGame(OSystem *syst, const ADGameDescription *gameDesc) : Engine(syst
 
 	_format = Graphics::PixelFormat(2, 5, 6, 5, 0, 11, 5, 0, 0);
 	_systemInit = false;
-	g_hdb = this;
-	_fileMan = new FileMan;
-	_gfx = new Gfx;
-	_lua = new LuaScript;
-	_menu = new Menu;
-	_map = new Map;
-	_ai = new AI;
-	_input = new Input;
-	_sound = new Sound;
-	_window = new Window;
+
+	_fileMan = nullptr;
+	_gfx = nullptr;
+	_lua = nullptr;
+	_menu = nullptr;
+	_map = nullptr;
+	_ai = nullptr;
+	_input = nullptr;
+	_sound = nullptr;
+	_window = nullptr;
 	_rnd = new Common::RandomSource("hdb");
 
 	_cheating = false;
@@ -123,6 +124,17 @@ bool HDBGame::init() {
 		Game Subsystem Initializations
 	*/
 
+	_systemInit = false;
+	_fileMan = new FileMan;
+	_gfx = new Gfx;
+	_lua = new LuaScript;
+	_menu = new Menu;
+	_map = new Map;
+	_ai = new AI;
+	_input = new Input;
+	_sound = new Sound;
+	_window = new Window;
+
 	// Init fileMan
 
 	if (!_fileMan->openMPC(getGameFile())) {
-- 
cgit v1.2.3