diff options
author | Strangerke | 2013-02-07 22:30:40 +0100 |
---|---|---|
committer | Strangerke | 2013-02-07 22:30:40 +0100 |
commit | a836676312c611dba197eebeba1f82890af2acad (patch) | |
tree | f7d68f79283cd5d7e2027340d6caf1b9e876043c /engines/hopkins/talk.cpp | |
parent | d12cd961610e3c2c8d060e2a300a5690dfb3daef (diff) | |
download | scummvm-rg350-a836676312c611dba197eebeba1f82890af2acad.tar.gz scummvm-rg350-a836676312c611dba197eebeba1f82890af2acad.tar.bz2 scummvm-rg350-a836676312c611dba197eebeba1f82890af2acad.zip |
HOPKINS:Move some variables from globals to ObjectManager
Diffstat (limited to 'engines/hopkins/talk.cpp')
-rw-r--r-- | engines/hopkins/talk.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/engines/hopkins/talk.cpp b/engines/hopkins/talk.cpp index 319b9f93a6..a05e42c2a9 100644 --- a/engines/hopkins/talk.cpp +++ b/engines/hopkins/talk.cpp @@ -884,7 +884,7 @@ void TalkManager::REPONSE2(int a1, int a2) { if (a1 == 22 || a1 == 23) { _vm->_objectsManager.setFlipSprite(0, false); _vm->_objectsManager.setSpriteIndex(0, 62); - _vm->_objectsManager.SPACTION(_vm->_globals._forestSprite, "2,3,4,5,6,7,8,9,10,11,12,-1,", 0, 0, 4, false); + _vm->_objectsManager.SPACTION(_vm->_objectsManager._forestSprite, "2,3,4,5,6,7,8,9,10,11,12,-1,", 0, 0, 4, false); if (a1 == 22) { _vm->_objectsManager.lockAnimX(6, _vm->_objectsManager.getBobPosX(3)); _vm->_objectsManager.lockAnimX(8, _vm->_objectsManager.getBobPosX(3)); @@ -896,7 +896,7 @@ void TalkManager::REPONSE2(int a1, int a2) { _vm->_objectsManager.stopBobAnimation(4); _vm->_objectsManager.setBobAnimation(6); _vm->_soundManager.PLAY_SAMPLE2(1); - _vm->_objectsManager.SPACTION1(_vm->_globals._forestSprite, "13,14,15,14,13,12,13,14,15,16,-1,", 0, 0, 4); + _vm->_objectsManager.SPACTION1(_vm->_objectsManager._forestSprite, "13,14,15,14,13,12,13,14,15,16,-1,", 0, 0, 4); do _vm->_eventsManager.VBL(); while (_vm->_objectsManager.getBobAnimDataIdx(6) < 12); @@ -932,7 +932,7 @@ void TalkManager::REPONSE2(int a1, int a2) { } else if (a1 == 20 || a1 == 21) { _vm->_objectsManager.setFlipSprite(0, true); _vm->_objectsManager.setSpriteIndex(0, 62); - _vm->_objectsManager.SPACTION(_vm->_globals._forestSprite, "2,3,4,5,6,7,8,9,10,11,12,-1,", 0, 0, 4, true); + _vm->_objectsManager.SPACTION(_vm->_objectsManager._forestSprite, "2,3,4,5,6,7,8,9,10,11,12,-1,", 0, 0, 4, true); if (a1 == 20) { _vm->_objectsManager.lockAnimX(5, _vm->_objectsManager.getBobPosX(1)); _vm->_objectsManager.lockAnimX(7, _vm->_objectsManager.getBobPosX(1)); @@ -944,7 +944,7 @@ void TalkManager::REPONSE2(int a1, int a2) { _vm->_objectsManager.stopBobAnimation(2); _vm->_objectsManager.setBobAnimation(5); _vm->_soundManager.PLAY_SAMPLE2(1); - _vm->_objectsManager.SPACTION1(_vm->_globals._forestSprite, "13,14,15,14,13,12,13,14,15,16,-1,", 0, 0, 4); + _vm->_objectsManager.SPACTION1(_vm->_objectsManager._forestSprite, "13,14,15,14,13,12,13,14,15,16,-1,", 0, 0, 4); do _vm->_eventsManager.VBL(); while (_vm->_objectsManager.getBobAnimDataIdx(5) < 12); |