[Scummvm-cvs-logs] scummvm master -> 25c153ff29baca89f5b594b70a8ff949d8edb89d

Strangerke Strangerke at scummvm.org
Wed May 28 00:53:22 CEST 2014


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

Summary:
91728aae9b MADS: Initialize several other variables
25c153ff29 MADS: Initialize variables in Animation


Commit: 91728aae9bc0f3fc1308c8d5bbe06afe4a3afc3d
    https://github.com/scummvm/scummvm/commit/91728aae9bc0f3fc1308c8d5bbe06afe4a3afc3d
Author: Strangerke (strangerke at scummvm.org)
Date: 2014-05-27T21:51:08+02:00

Commit Message:
MADS: Initialize several other variables

Changed paths:
    engines/mads/game.cpp
    engines/mads/hotspots.cpp
    engines/mads/messages.cpp



diff --git a/engines/mads/game.cpp b/engines/mads/game.cpp
index 0576703..05dd932 100644
--- a/engines/mads/game.cpp
+++ b/engines/mads/game.cpp
@@ -76,8 +76,10 @@ Game::Game(MADSEngine *vm)
 	_anyEmergency = false;
 	_triggerMode = SEQUENCE_TRIGGER_PARSER;
 	_triggerSetupMode = SEQUENCE_TRIGGER_DAEMON;
+	_trigger = 0;
 	_winStatus = 0;
 	_widepipeCtr = 0;
+	_fx = kTransitionNone;
 
 	// Load the inventory object list
 	_objects.load();
diff --git a/engines/mads/hotspots.cpp b/engines/mads/hotspots.cpp
index 497791c..4fefe9d 100644
--- a/engines/mads/hotspots.cpp
+++ b/engines/mads/hotspots.cpp
@@ -32,6 +32,7 @@ DynamicHotspot::DynamicHotspot() {
 	_verbId = 0;
 	_articleNumber = 0;
 	_cursor = CURSOR_NONE;
+	_active = false;
 }
 
 void DynamicHotspot::synchronize(Common::Serializer &s) {
diff --git a/engines/mads/messages.cpp b/engines/mads/messages.cpp
index f5d1047..ae56f87 100644
--- a/engines/mads/messages.cpp
+++ b/engines/mads/messages.cpp
@@ -32,6 +32,9 @@ namespace MADS {
 RandomMessages::RandomMessages() {
 	reserve(RANDOM_MESSAGE_SIZE);
 	_randomSpacing = 0;
+	_color = -1;
+	_duration = 0;
+	_scrollRate = -1;
 }
 
 void RandomMessages::reset() {


Commit: 25c153ff29baca89f5b594b70a8ff949d8edb89d
    https://github.com/scummvm/scummvm/commit/25c153ff29baca89f5b594b70a8ff949d8edb89d
Author: Strangerke (strangerke at scummvm.org)
Date: 2014-05-28T00:51:48+02:00

Commit Message:
MADS: Initialize variables in Animation

Changed paths:
    engines/mads/animation.cpp



diff --git a/engines/mads/animation.cpp b/engines/mads/animation.cpp
index 0f98cb5..6af8a9a 100644
--- a/engines/mads/animation.cpp
+++ b/engines/mads/animation.cpp
@@ -164,6 +164,17 @@ Animation::Animation(MADSEngine *vm, Scene *scene) : _vm(vm), _scene(scene) {
 	_resetFlag = false;
 	_messageCtr = 0;
 	_skipLoad = false;
+	_freeFlag = false;
+	_unkIndex = -1;
+	_nextFrameTimer = 0;
+	_nextScrollTimer = 0;
+	_trigger = 0;
+	_triggerMode = SEQUENCE_TRIGGER_PREPARE;
+	_actionDetails._verbId = VERB_NONE;
+	_actionDetails._objectNameId = -1;
+	_actionDetails._indirectObjectId = -1;
+	_currentFrame = 0;
+	_oldFrameEntry = 0;
 }
 
 Animation::~Animation() {






More information about the Scummvm-git-logs mailing list