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

[Strangerke]

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

Summary:
13b8e1b0de MADS: Initialize _srcSize in SpriteAsset
d3860c573e MADS: Initialize some variables in MADSAction
e7f467c41f MADS: Initialize some variables in EventsManager


Commit: 13b8e1b0ded6717ba59f836606164258a8d1bb86
    https://github.com/scummvm/scummvm/commit/13b8e1b0ded6717ba59f836606164258a8d1bb86
Author: Strangerke (strangerke at scummvm.org)
Date: 2014-05-27T00:06:29+02:00

Commit Message:
MADS: Initialize _srcSize in SpriteAsset

Changed paths:
    engines/mads/assets.cpp



diff --git a/engines/mads/assets.cpp b/engines/mads/assets.cpp
index 1cb174b..0bbf617 100644
--- a/engines/mads/assets.cpp
+++ b/engines/mads/assets.cpp
@@ -29,11 +29,11 @@
 
 namespace MADS {
 
-SpriteAsset::SpriteAsset(MADSEngine *vm, const Common::String &resourceName, int flags) :
-	_vm(vm) {
+SpriteAsset::SpriteAsset(MADSEngine *vm, const Common::String &resourceName, int flags) : _vm(vm) {
 	Common::String resName = resourceName;
 	if (!resName.hasSuffix(".SS") && !resName.hasSuffix(".ss"))
 		resName += ".SS";
+	_srcSize = 0;
 
 	File file(resName);
 	load(&file, flags);
@@ -41,8 +41,9 @@ SpriteAsset::SpriteAsset(MADSEngine *vm, const Common::String &resourceName, int
 	file.close();
 }
 
-SpriteAsset::SpriteAsset(MADSEngine *vm, Common::SeekableReadStream *stream, int flags) :
-		_vm(vm) {
+SpriteAsset::SpriteAsset(MADSEngine *vm, Common::SeekableReadStream *stream, int flags) : _vm(vm) {
+	_srcSize = 0;
+
 	load(stream, flags);
 }
 


Commit: d3860c573e1bea5825b9481e29570690895255ea
    https://github.com/scummvm/scummvm/commit/d3860c573e1bea5825b9481e29570690895255ea
Author: Strangerke (strangerke at scummvm.org)
Date: 2014-05-27T00:06:30+02:00

Commit Message:
MADS: Initialize some variables in MADSAction

Changed paths:
    engines/mads/action.cpp
    engines/mads/action.h



diff --git a/engines/mads/action.cpp b/engines/mads/action.cpp
index 4672ffa..1e09ce7 100644
--- a/engines/mads/action.cpp
+++ b/engines/mads/action.cpp
@@ -65,6 +65,14 @@ MADSAction::MADSAction(MADSEngine *vm) : _vm(vm) {
 	_savedFields._secondObjectSource = 0;
 	_savedFields._articleNumber = PREP_NONE;
 	_savedFields._lookFlag = false;
+
+	_activeAction._verbId = VERB_NONE;
+	_activeAction._objectNameId = -1;
+	_activeAction._indirectObjectId = -1;
+	_savedFields._commandError = false;
+	_verbType = VERB_INIT;
+	_prepType = PREP_NONE;
+	_pickedWord = -1;
 }
 
 void MADSAction::clear() {
diff --git a/engines/mads/action.h b/engines/mads/action.h
index 3010226..cfd5a3b 100644
--- a/engines/mads/action.h
+++ b/engines/mads/action.h
@@ -58,7 +58,7 @@ enum {
 	VERB_WALKTO = 13
 };
 
-enum VerbType { VERB_ONLY, VERB_THIS, VERB_THAT };
+enum VerbType { VERB_ONLY, VERB_THIS, VERB_THAT, VERB_INIT };
 
 enum PrepType {
 	PREP_NONE, PREP_WITH, PREP_TO, PREP_AT, PREP_FROM, PREP_ON, PREP_IN,


Commit: e7f467c41f96d2eaf7ffb017e635815105417bea
    https://github.com/scummvm/scummvm/commit/e7f467c41f96d2eaf7ffb017e635815105417bea
Author: Strangerke (strangerke at scummvm.org)
Date: 2014-05-27T00:06:32+02:00

Commit Message:
MADS: Initialize some variables in EventsManager

Changed paths:
    engines/mads/events.cpp



diff --git a/engines/mads/events.cpp b/engines/mads/events.cpp
index e1240da..b72d3f4 100644
--- a/engines/mads/events.cpp
+++ b/engines/mads/events.cpp
@@ -46,6 +46,7 @@ EventsManager::EventsManager(MADSEngine *vm) {
 	_mouseMoved = false;
 	_vD8 = 0;
 	_rightMousePressed = false;
+	_cursorId = _newCursorId = CURSOR_NONE;
 }
 
 EventsManager::~EventsManager() {