diff options
author | Strangerke | 2013-02-15 07:54:54 +0100 |
---|---|---|
committer | Strangerke | 2013-02-15 07:56:47 +0100 |
commit | 078f950f386ac7bc204423c58b185b536d4b2edc (patch) | |
tree | 91c25059c1d25cffe436da0fa5832a5ecced4b58 /engines/hopkins/script.cpp | |
parent | fb163db0bc2bfb9f7edea812bc25348dc0378d84 (diff) | |
download | scummvm-rg350-078f950f386ac7bc204423c58b185b536d4b2edc.tar.gz scummvm-rg350-078f950f386ac7bc204423c58b185b536d4b2edc.tar.bz2 scummvm-rg350-078f950f386ac7bc204423c58b185b536d4b2edc.zip |
HOPKINS: Renaming in ObjectsManager
Diffstat (limited to 'engines/hopkins/script.cpp')
-rw-r--r-- | engines/hopkins/script.cpp | 146 |
1 files changed, 73 insertions, 73 deletions
diff --git a/engines/hopkins/script.cpp b/engines/hopkins/script.cpp index c75443ff8a..04cacf6ec8 100644 --- a/engines/hopkins/script.cpp +++ b/engines/hopkins/script.cpp @@ -277,172 +277,172 @@ int ScriptManager::handleOpcode(byte *dataP) { case 1: case 14: if (_vm->_globals._actionDirection == 1) - _vm->_objectsManager.ACTION_DOS(4); + _vm->_objectsManager.doActionBack(4); if (_vm->_globals._actionDirection == 3) - _vm->_objectsManager.ACTION_DROITE(4); + _vm->_objectsManager.doActionRight(4); if (_vm->_globals._actionDirection == 2) - _vm->_objectsManager.Q_DROITE(4); + _vm->_objectsManager.doActionDiagRight(4); if (_vm->_globals._actionDirection == 5) - _vm->_objectsManager.ACTION_FACE(4); + _vm->_objectsManager.doActionFront(4); if (_vm->_globals._actionDirection == 8) - _vm->_objectsManager.Q_GAUCHE(4); + _vm->_objectsManager.doActionDiagLeft(4); if (_vm->_globals._actionDirection == 7) - _vm->_objectsManager.ACTION_GAUCHE(4); + _vm->_objectsManager.doActionLeft(4); break; case 2: if (_vm->_globals._actionDirection == 1) - _vm->_objectsManager.ACTION_DOS(7); + _vm->_objectsManager.doActionBack(7); if (_vm->_globals._actionDirection == 3) - _vm->_objectsManager.ACTION_DROITE(7); + _vm->_objectsManager.doActionRight(7); if (_vm->_globals._actionDirection == 2) - _vm->_objectsManager.Q_DROITE(7); + _vm->_objectsManager.doActionDiagRight(7); if (_vm->_globals._actionDirection == 5) - _vm->_objectsManager.ACTION_FACE(7); + _vm->_objectsManager.doActionFront(7); if (_vm->_globals._actionDirection == 8) - _vm->_objectsManager.Q_GAUCHE(7); + _vm->_objectsManager.doActionDiagLeft(7); if (_vm->_globals._actionDirection == 7) - _vm->_objectsManager.ACTION_GAUCHE(7); + _vm->_objectsManager.doActionLeft(7); if (_vm->_globals._actionDirection == 1) - _vm->_objectsManager.ACTION_DOS(8); + _vm->_objectsManager.doActionBack(8); if (_vm->_globals._actionDirection == 3) - _vm->_objectsManager.ACTION_DROITE(8); + _vm->_objectsManager.doActionRight(8); if (_vm->_globals._actionDirection == 2) - _vm->_objectsManager.Q_DROITE(8); + _vm->_objectsManager.doActionDiagRight(8); if (_vm->_globals._actionDirection == 5) - _vm->_objectsManager.ACTION_FACE(8); + _vm->_objectsManager.doActionFront(8); if (_vm->_globals._actionDirection == 8) - _vm->_objectsManager.Q_GAUCHE(8); + _vm->_objectsManager.doActionDiagLeft(8); if (_vm->_globals._actionDirection == 7) - _vm->_objectsManager.ACTION_GAUCHE(8); + _vm->_objectsManager.doActionLeft(8); break; case 19: case 4: if (_vm->_globals._actionDirection == 1) - _vm->_objectsManager.ACTION_DOS(1); + _vm->_objectsManager.doActionBack(1); if (_vm->_globals._actionDirection == 3) - _vm->_objectsManager.ACTION_DROITE(1); + _vm->_objectsManager.doActionRight(1); if (_vm->_globals._actionDirection == 2) - _vm->_objectsManager.Q_DROITE(1); + _vm->_objectsManager.doActionDiagRight(1); if (_vm->_globals._actionDirection == 5) - _vm->_objectsManager.ACTION_FACE(1); + _vm->_objectsManager.doActionFront(1); if (_vm->_globals._actionDirection == 8) - _vm->_objectsManager.Q_GAUCHE(1); + _vm->_objectsManager.doActionDiagLeft(1); if (_vm->_globals._actionDirection == 7) - _vm->_objectsManager.ACTION_GAUCHE(1); + _vm->_objectsManager.doActionLeft(1); break; case 5: if (_vm->_globals._actionDirection == 1) - _vm->_objectsManager.ACTION_DOS(5); + _vm->_objectsManager.doActionBack(5); if (_vm->_globals._actionDirection == 3) - _vm->_objectsManager.ACTION_DROITE(5); + _vm->_objectsManager.doActionRight(5); if (_vm->_globals._actionDirection == 2) - _vm->_objectsManager.Q_DROITE(5); + _vm->_objectsManager.doActionDiagRight(5); if (_vm->_globals._actionDirection == 5) - _vm->_objectsManager.ACTION_FACE(5); + _vm->_objectsManager.doActionFront(5); if (_vm->_globals._actionDirection == 8) - _vm->_objectsManager.Q_GAUCHE(5); + _vm->_objectsManager.doActionDiagLeft(5); if (_vm->_globals._actionDirection == 7) - _vm->_objectsManager.ACTION_GAUCHE(5); + _vm->_objectsManager.doActionLeft(5); if (_vm->_globals._actionDirection == 1) - _vm->_objectsManager.ACTION_DOS(6); + _vm->_objectsManager.doActionBack(6); if (_vm->_globals._actionDirection == 3) - _vm->_objectsManager.ACTION_DROITE(6); + _vm->_objectsManager.doActionRight(6); if (_vm->_globals._actionDirection == 2) - _vm->_objectsManager.Q_DROITE(6); + _vm->_objectsManager.doActionDiagRight(6); if (_vm->_globals._actionDirection == 5) - _vm->_objectsManager.ACTION_FACE(6); + _vm->_objectsManager.doActionFront(6); if (_vm->_globals._actionDirection == 8) - _vm->_objectsManager.Q_GAUCHE(6); + _vm->_objectsManager.doActionDiagLeft(6); if (_vm->_globals._actionDirection == 7) - _vm->_objectsManager.ACTION_GAUCHE(6); + _vm->_objectsManager.doActionLeft(6); break; case 17: case 7: if (_vm->_globals._actionDirection == 1) - _vm->_objectsManager.ACTION_DOS(2); + _vm->_objectsManager.doActionBack(2); if (_vm->_globals._actionDirection == 3) - _vm->_objectsManager.ACTION_DROITE(2); + _vm->_objectsManager.doActionRight(2); if (_vm->_globals._actionDirection == 2) - _vm->_objectsManager.Q_DROITE(2); + _vm->_objectsManager.doActionDiagRight(2); if (_vm->_globals._actionDirection == 5) - _vm->_objectsManager.ACTION_FACE(2); + _vm->_objectsManager.doActionFront(2); if (_vm->_globals._actionDirection == 8) - _vm->_objectsManager.Q_GAUCHE(2); + _vm->_objectsManager.doActionDiagLeft(2); if (_vm->_globals._actionDirection == 7) - _vm->_objectsManager.ACTION_GAUCHE(2); + _vm->_objectsManager.doActionLeft(2); break; case 18: case 8: if (_vm->_globals._actionDirection == 1) - _vm->_objectsManager.ACTION_DOS(3); + _vm->_objectsManager.doActionBack(3); if (_vm->_globals._actionDirection == 3) - _vm->_objectsManager.ACTION_DROITE(3); + _vm->_objectsManager.doActionRight(3); if (_vm->_globals._actionDirection == 2) - _vm->_objectsManager.Q_DROITE(3); + _vm->_objectsManager.doActionDiagRight(3); if (_vm->_globals._actionDirection == 5) - _vm->_objectsManager.ACTION_FACE(3); + _vm->_objectsManager.doActionFront(3); if (_vm->_globals._actionDirection == 8) - _vm->_objectsManager.Q_GAUCHE(3); + _vm->_objectsManager.doActionDiagLeft(3); if (_vm->_globals._actionDirection == 7) - _vm->_objectsManager.ACTION_GAUCHE(3); + _vm->_objectsManager.doActionLeft(3); break; case 9: if (_vm->_globals._actionDirection == 1) - _vm->_objectsManager.ACTION_DOS(5); + _vm->_objectsManager.doActionBack(5); if (_vm->_globals._actionDirection == 3) - _vm->_objectsManager.ACTION_DROITE(5); + _vm->_objectsManager.doActionRight(5); if (_vm->_globals._actionDirection == 2) - _vm->_objectsManager.Q_DROITE(5); + _vm->_objectsManager.doActionDiagRight(5); if (_vm->_globals._actionDirection == 5) - _vm->_objectsManager.ACTION_FACE(5); + _vm->_objectsManager.doActionFront(5); if (_vm->_globals._actionDirection == 8) - _vm->_objectsManager.Q_GAUCHE(5); + _vm->_objectsManager.doActionDiagLeft(5); if (_vm->_globals._actionDirection == 7) - _vm->_objectsManager.ACTION_GAUCHE(5); + _vm->_objectsManager.doActionLeft(5); break; case 10: if (_vm->_globals._actionDirection == 1) - _vm->_objectsManager.ACTION_DOS(6); + _vm->_objectsManager.doActionBack(6); if (_vm->_globals._actionDirection == 3) - _vm->_objectsManager.ACTION_DROITE(6); + _vm->_objectsManager.doActionRight(6); if (_vm->_globals._actionDirection == 2) - _vm->_objectsManager.Q_DROITE(6); + _vm->_objectsManager.doActionDiagRight(6); if (_vm->_globals._actionDirection == 5) - _vm->_objectsManager.ACTION_FACE(6); + _vm->_objectsManager.doActionFront(6); if (_vm->_globals._actionDirection == 8) - _vm->_objectsManager.Q_GAUCHE(6); + _vm->_objectsManager.doActionDiagLeft(6); if (_vm->_globals._actionDirection == 7) - _vm->_objectsManager.ACTION_GAUCHE(6); + _vm->_objectsManager.doActionLeft(6); break; case 15: case 11: if (_vm->_globals._actionDirection == 1) - _vm->_objectsManager.ACTION_DOS(7); + _vm->_objectsManager.doActionBack(7); if (_vm->_globals._actionDirection == 3) - _vm->_objectsManager.ACTION_DROITE(7); + _vm->_objectsManager.doActionRight(7); if (_vm->_globals._actionDirection == 2) - _vm->_objectsManager.Q_DROITE(7); + _vm->_objectsManager.doActionDiagRight(7); if (_vm->_globals._actionDirection == 5) - _vm->_objectsManager.ACTION_FACE(7); + _vm->_objectsManager.doActionFront(7); if (_vm->_globals._actionDirection == 8) - _vm->_objectsManager.Q_GAUCHE(7); + _vm->_objectsManager.doActionDiagLeft(7); if (_vm->_globals._actionDirection == 7) - _vm->_objectsManager.ACTION_GAUCHE(7); + _vm->_objectsManager.doActionLeft(7); break; case 16: case 12: if (_vm->_globals._actionDirection == 1) - _vm->_objectsManager.ACTION_DOS(8); + _vm->_objectsManager.doActionBack(8); if (_vm->_globals._actionDirection == 3) - _vm->_objectsManager.ACTION_DROITE(8); + _vm->_objectsManager.doActionRight(8); if (_vm->_globals._actionDirection == 2) - _vm->_objectsManager.Q_DROITE(8); + _vm->_objectsManager.doActionDiagRight(8); if (_vm->_globals._actionDirection == 5) - _vm->_objectsManager.ACTION_FACE(8); + _vm->_objectsManager.doActionFront(8); if (_vm->_globals._actionDirection == 8) - _vm->_objectsManager.Q_GAUCHE(8); + _vm->_objectsManager.doActionDiagLeft(8); if (_vm->_globals._actionDirection == 7) - _vm->_objectsManager.ACTION_GAUCHE(8); + _vm->_objectsManager.doActionLeft(8); break; } } @@ -1482,7 +1482,7 @@ int ScriptManager::handleOpcode(byte *dataP) { _vm->_objectsManager.stopBobAnimation(5); } _vm->_objectsManager.animateSprite(0); - _vm->_objectsManager.ACTION_DOS(1); + _vm->_objectsManager.doActionBack(1); _vm->_soundManager.DEL_SAMPLE(1); break; |