diff options
| author | Paul Gilbert | 2015-04-29 21:41:49 -1000 |
|---|---|---|
| committer | Paul Gilbert | 2015-04-29 21:41:49 -1000 |
| commit | aba28c4737d8534d160ed0ada17c6c109c0e7b4c (patch) | |
| tree | 0f7f2abf25a18ac2380f513bf1c34c84f9b5b979 /engines/sherlock | |
| parent | f34b9a59b52460cae64d526cf9d9eccba922e376 (diff) | |
| download | scummvm-rg350-aba28c4737d8534d160ed0ada17c6c109c0e7b4c.tar.gz scummvm-rg350-aba28c4737d8534d160ed0ada17c6c109c0e7b4c.tar.bz2 scummvm-rg350-aba28c4737d8534d160ed0ada17c6c109c0e7b4c.zip | |
SHERLOCK: Move _slowChess to Map _frameChangeFlag
Diffstat (limited to 'engines/sherlock')
| -rw-r--r-- | engines/sherlock/map.cpp | 1 | ||||
| -rw-r--r-- | engines/sherlock/map.h | 1 | ||||
| -rw-r--r-- | engines/sherlock/objects.cpp | 2 | ||||
| -rw-r--r-- | engines/sherlock/sherlock.cpp | 1 | ||||
| -rw-r--r-- | engines/sherlock/sherlock.h | 1 |
5 files changed, 3 insertions, 3 deletions
diff --git a/engines/sherlock/map.cpp b/engines/sherlock/map.cpp index a807d52f91..5ff27a9709 100644 --- a/engines/sherlock/map.cpp +++ b/engines/sherlock/map.cpp @@ -64,6 +64,7 @@ Map::Map(SherlockEngine *vm): _vm(vm), _topLine(SHERLOCK_SCREEN_WIDTH, 12) { _overPos = Common::Point(13000, 12600); _charPoint = 0; _oldCharPoint = 39; + _frameChangeFlag = false; for (int idx = 0; idx < MAX_HOLMES_SEQUENCE; ++idx) Common::fill(&_sequences[idx][0], &_sequences[idx][MAX_FRAME], 0); diff --git a/engines/sherlock/map.h b/engines/sherlock/map.h index 435ca8d5d7..e4c6655db9 100644 --- a/engines/sherlock/map.h +++ b/engines/sherlock/map.h @@ -99,6 +99,7 @@ public: Point32 _overPos; Point32 _bigPos; int _charPoint, _oldCharPoint; + bool _frameChangeFlag; public: Map(SherlockEngine *vm); diff --git a/engines/sherlock/objects.cpp b/engines/sherlock/objects.cpp index d9cc38e55f..04c7599b6d 100644 --- a/engines/sherlock/objects.cpp +++ b/engines/sherlock/objects.cpp @@ -126,7 +126,7 @@ void Sprite::adjustSprite() { _position.x = CLIP((int)_position.x, LEFT_LIMIT, RIGHT_LIMIT); } - if (!map._active || (_vm->_slowChess = !_vm->_slowChess)) + if (!map._active || (map._frameChangeFlag = !map._frameChangeFlag)) ++_frameNumber; if ((*_sequences)[_sequenceNumber][_frameNumber] == 0) { diff --git a/engines/sherlock/sherlock.cpp b/engines/sherlock/sherlock.cpp index 406b796fc9..a8d3d9a535 100644 --- a/engines/sherlock/sherlock.cpp +++ b/engines/sherlock/sherlock.cpp @@ -47,7 +47,6 @@ SherlockEngine::SherlockEngine(OSystem *syst, const SherlockGameDescription *gam _ui = nullptr; _useEpilogue2 = false; _loadingSavedGame = false; - _slowChess = false; _keyPadSpeed = 0; _loadGameSlot = -1; _canLoadSave = false; diff --git a/engines/sherlock/sherlock.h b/engines/sherlock/sherlock.h index 921559183d..3f0779421c 100644 --- a/engines/sherlock/sherlock.h +++ b/engines/sherlock/sherlock.h @@ -104,7 +104,6 @@ public: Common::String _titleOverride; bool _useEpilogue2; bool _loadingSavedGame; - bool _slowChess; int _keyPadSpeed; int _loadGameSlot; bool _canLoadSave; |