aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStrangerke2016-01-11 06:54:11 +0100
committerStrangerke2016-01-11 06:54:11 +0100
commit83a5ee43c256e464781f1b00a33f56f24c6ec42d (patch)
treecdb2d3c87b5fd5f9bfde361c7d15381a7e521911
parent2483ac7f1bf548c5f20c0b698f4ea82a529dae77 (diff)
downloadscummvm-rg350-83a5ee43c256e464781f1b00a33f56f24c6ec42d.tar.gz
scummvm-rg350-83a5ee43c256e464781f1b00a33f56f24c6ec42d.tar.bz2
scummvm-rg350-83a5ee43c256e464781f1b00a33f56f24c6ec42d.zip
MADS: Initialize some variables in player code
-rw-r--r--engines/mads/action.h1
-rw-r--r--engines/mads/player.cpp7
2 files changed, 7 insertions, 1 deletions
diff --git a/engines/mads/action.h b/engines/mads/action.h
index 3ea10cd964..042fd971c9 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 7d9a4fd8df..0940e79562 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() {