diff options
author | Paul Gilbert | 2015-05-18 18:52:20 -0400 |
---|---|---|
committer | Paul Gilbert | 2015-05-18 18:52:20 -0400 |
commit | 46293735c4e10d654d6195fce7781782f1024b26 (patch) | |
tree | 01b0108b42956e79c5a8f5b9a203fe6e703026ff | |
parent | 437bcf3cfe4aabe99359d3b6db3cd8e13f3e8763 (diff) | |
download | scummvm-rg350-46293735c4e10d654d6195fce7781782f1024b26.tar.gz scummvm-rg350-46293735c4e10d654d6195fce7781782f1024b26.tar.bz2 scummvm-rg350-46293735c4e10d654d6195fce7781782f1024b26.zip |
SHERLOCK: Remove some redundant fields from UseType
-rw-r--r-- | engines/sherlock/objects.cpp | 6 | ||||
-rw-r--r-- | engines/sherlock/objects.h | 2 |
2 files changed, 1 insertions, 7 deletions
diff --git a/engines/sherlock/objects.cpp b/engines/sherlock/objects.cpp index b4371cd71b..05a058a3bb 100644 --- a/engines/sherlock/objects.cpp +++ b/engines/sherlock/objects.cpp @@ -386,8 +386,6 @@ void ActionType::load(Common::SeekableReadStream &s) { UseType::UseType() { _cAnimNum = _cAnimSpeed = 0; _useFlag = 0; - _dFlag[0] = 0; - _lFlag[0] = _lFlag[1] = 0; } /** @@ -407,9 +405,7 @@ void UseType::load(Common::SeekableReadStream &s) { } _useFlag = s.readSint16LE(); - _dFlag[0] = s.readSint16LE(); - _lFlag[0] = s.readSint16LE(); - _lFlag[1] = s.readSint16LE(); + s.skip(6); s.read(buffer, 12); _target = Common::String(buffer); diff --git a/engines/sherlock/objects.h b/engines/sherlock/objects.h index 7a1ef1aebe..4e7b006844 100644 --- a/engines/sherlock/objects.h +++ b/engines/sherlock/objects.h @@ -156,8 +156,6 @@ struct UseType { int _cAnimSpeed; Common::String _names[4]; int _useFlag; // Which flag USE will set (if any) - int _dFlag[1]; - int _lFlag[2]; Common::String _target; UseType(); |