[Scummvm-cvs-logs] scummvm master -> 83a5ee43c256e464781f1b00a33f56f24c6ec42d

Strangerke Strangerke at scummvm.org
Mon Jan 11 07:00:37 CET 2016


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:
83a5ee43c2 MADS: Initialize some variables in player code


Commit: 83a5ee43c256e464781f1b00a33f56f24c6ec42d
    https://github.com/scummvm/scummvm/commit/83a5ee43c256e464781f1b00a33f56f24c6ec42d
Author: Strangerke (strangerke at scummvm.org)
Date: 2016-01-11T06:54:11+01:00

Commit Message:
MADS: Initialize some variables in player code

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



diff --git a/engines/mads/action.h b/engines/mads/action.h
index 3ea10cd..042fd97 100644
--- a/engines/mads/action.h
+++ b/engines/mads/action.h
@@ -30,6 +30,7 @@
 namespace MADS {
 
 enum TriggerMode {
+	SEQUENCE_TRIGGER_NONE = -1,
 	SEQUENCE_TRIGGER_PARSER = 0,		// Triggers parser
 	SEQUENCE_TRIGGER_DAEMON = 1,		// Triggers step/daemon code
 	SEQUENCE_TRIGGER_PREPARE = 2		// Triggers preparser
diff --git a/engines/mads/player.cpp b/engines/mads/player.cpp
index 7d9a4fd..0940e79 100644
--- a/engines/mads/player.cpp
+++ b/engines/mads/player.cpp
@@ -109,9 +109,14 @@ Player::Player(MADSEngine *vm)
 	_forcePrefix = false;
 	_commandsAllowed = false;
 	_enableAtTarget = false;
-	_walkTrigger = 0;
 
 	Common::fill(&_spriteSetsPresent[0], &_spriteSetsPresent[PLAYER_SPRITES_FILE_COUNT], false);
+
+	_walkTrigger = 0;
+	_walkTriggerDest = SEQUENCE_TRIGGER_NONE;
+	_walkTriggerAction._verbId = VERB_NONE;
+	_walkTriggerAction._objectNameId = 0;
+	_walkTriggerAction._indirectObjectId = 0;
 }
 
 void Player::cancelWalk() {






More information about the Scummvm-git-logs mailing list