AVALANCHE: Fix CID 1109674

scummvm · Nov 3, 2013 · c24ba38 · c24ba38
1 parent fbd365b
commit c24ba38
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 5 deletions.
diff --git a/engines/avalanche/avalanche.cpp b/engines/avalanche/avalanche.cpp
@@ -43,6 +43,21 @@ AvalancheEngine::AvalancheEngine(OSystem *syst, const AvalancheGameDescription *
 	_rnd->setSeed(time.tm_sec + time.tm_min + time.tm_hour);
 	_showDebugLines = false;
 
+	_clock = nullptr;
+	_graphics = nullptr;
+	_parser = nullptr;
+	_pingo = nullptr;
+	_dialogs = nullptr;
+	_background = nullptr;
+	_sequence = nullptr;
+	_timer = nullptr;
+	_animation = nullptr;
+	_menu = nullptr;
+	_closing = nullptr;
+	_sound = nullptr;
+
+	_platform = gd->desc.platform;
+
 	initVariables();
 }
 
@@ -130,6 +145,7 @@ void AvalancheEngine::initVariables() {
 	_thinkThing = true;
 	_seeScroll = false;
 	_currentMouse = 177;
+	_holdLeftMouse = false;
 }
 
 Common::ErrorCode AvalancheEngine::initialize() {

diff --git a/engines/avalanche/avalanche.h b/engines/avalanche/avalanche.h
@@ -55,7 +55,9 @@ class RandomSource;
 
 namespace Avalanche {
 
-struct AvalancheGameDescription;
+struct AvalancheGameDescription {
+	ADGameDescription desc;
+};
 
 static const int kSavegameVersion = 1;
 

diff --git a/engines/avalanche/detection.cpp b/engines/avalanche/detection.cpp
@@ -35,10 +35,6 @@
 
 namespace Avalanche {
 
-struct AvalancheGameDescription {
-	ADGameDescription desc;
-};
-
 uint32 AvalancheEngine::getFeatures() const {
 	return _gameDescription->desc.flags;
 }