[Scummvm-cvs-logs] scummvm master -> c24ba381cba9a18d0ab568d8709d64633472d8ca

Strangerke Strangerke at scummvm.org
Sun Nov 3 10:51:49 CET 2013


This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
c24ba381cb AVALANCHE: Fix CID 1109674


Commit: c24ba381cba9a18d0ab568d8709d64633472d8ca
    https://github.com/scummvm/scummvm/commit/c24ba381cba9a18d0ab568d8709d64633472d8ca
Author: Strangerke (strangerke at scummvm.org)
Date: 2013-11-03T01:51:15-08:00

Commit Message:
AVALANCHE: Fix CID 1109674

Changed paths:
    engines/avalanche/avalanche.cpp
    engines/avalanche/avalanche.h
    engines/avalanche/detection.cpp



diff --git a/engines/avalanche/avalanche.cpp b/engines/avalanche/avalanche.cpp
index ef03c51..e373ab5 100644
--- 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
index 3cc342c..b6e168f 100644
--- 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
index 428e71f..048b0fe 100644
--- 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;
 }






More information about the Scummvm-git-logs mailing list