From 078f950f386ac7bc204423c58b185b536d4b2edc Mon Sep 17 00:00:00 2001 From: Strangerke Date: Fri, 15 Feb 2013 07:54:54 +0100 Subject: HOPKINS: Renaming in ObjectsManager --- engines/hopkins/globals.cpp | 10 +-- engines/hopkins/globals.h | 4 +- engines/hopkins/objects.cpp | 168 ++++++++++++++++++++++---------------------- engines/hopkins/objects.h | 13 ++-- engines/hopkins/script.cpp | 146 +++++++++++++++++++------------------- 5 files changed, 171 insertions(+), 170 deletions(-) diff --git a/engines/hopkins/globals.cpp b/engines/hopkins/globals.cpp index 516eb4d1ac..d854c571be 100644 --- a/engines/hopkins/globals.cpp +++ b/engines/hopkins/globals.cpp @@ -150,7 +150,7 @@ Globals::Globals() { CACHE_BANQUE[idx] = NULL; SPRITE_ECRAN = NULL; _saveData = NULL; - GESTE = NULL; + _gestureBuf = NULL; _inventoryObject = NULL; _answerBuffer = g_PTRNUL; ADR_FICHIER_OBJ = NULL; @@ -159,7 +159,7 @@ Globals::Globals() { // Reset flags _censorshipFl = false; - GESTE_FLAG = 0; + _curGestureFile = 0; _disableInventFl = false; NOMARCHE = false; _optionDialogFl = false; @@ -190,7 +190,7 @@ Globals::~Globals() { CACHE_BANQUE[idx] = freeMemory(CACHE_BANQUE[idx]); freeMemory(SPRITE_ECRAN); freeMemory((byte *)_saveData); - freeMemory(GESTE); + freeMemory(_gestureBuf); freeMemory(_inventoryObject); freeMemory(_answerBuffer); freeMemory(ADR_FICHIER_OBJ); @@ -276,8 +276,8 @@ void Globals::clearAll() { ADR_FICHIER_OBJ = g_PTRNUL; - GESTE = g_PTRNUL; - GESTE_FLAG = 0; + _gestureBuf = g_PTRNUL; + _curGestureFile = 0; } void Globals::loadCharacterData() { diff --git a/engines/hopkins/globals.h b/engines/hopkins/globals.h index e3dd68046b..babd145cb9 100644 --- a/engines/hopkins/globals.h +++ b/engines/hopkins/globals.h @@ -315,8 +315,8 @@ public: Common::String FICH_ZONE; bool GOACTION; int j_104; - int GESTE_FLAG; - byte *GESTE; + int _curGestureFile; + byte *_gestureBuf; Common::String FICH_TEXTE; Globals(); diff --git a/engines/hopkins/objects.cpp b/engines/hopkins/objects.cpp index bd45bbc24b..89f00df5b0 100644 --- a/engines/hopkins/objects.cpp +++ b/engines/hopkins/objects.cpp @@ -2734,230 +2734,230 @@ void ObjectsManager::VBOB_OFF(int idx) { _vm->_globals.VBob[idx].field4 = 4; } -void ObjectsManager::ACTION_DOS(int idx) { - if (_vm->_globals.GESTE_FLAG != 1) { - _vm->_globals.GESTE = _vm->_globals.freeMemory(_vm->_globals.GESTE); - _vm->_globals.GESTE_FLAG = 1; - _vm->_globals.GESTE = _vm->_fileManager.loadFile("DOS.SPR"); +void ObjectsManager::doActionBack(int idx) { + if (_vm->_globals._curGestureFile != 1) { + _vm->_globals._gestureBuf = _vm->_globals.freeMemory(_vm->_globals._gestureBuf); + _vm->_globals._curGestureFile = 1; + _vm->_globals._gestureBuf = _vm->_fileManager.loadFile("DOS.SPR"); } switch (idx) { case 1: - ACTION(_vm->_globals.GESTE, "0,1,2,3,4,5,6,7,8,8,8,8,8,8,7,6,5,4,3,2,1,0,-1,", 0, 0, 8, false); + ACTION(_vm->_globals._gestureBuf, "0,1,2,3,4,5,6,7,8,8,8,8,8,8,7,6,5,4,3,2,1,0,-1,", 0, 0, 8, false); break; case 2: - SPACTION(_vm->_globals.GESTE, "0,1,2,3,4,5,6,7,8,9,10,11,12,13,-1,", 0, 0, 8, false); + SPACTION(_vm->_globals._gestureBuf, "0,1,2,3,4,5,6,7,8,9,10,11,12,13,-1,", 0, 0, 8, false); break; case 3: - SPACTION1(_vm->_globals.GESTE, "12,11,10,9,8,7,6,5,4,3,2,1,0,-1,", 0, 0, 8); + SPACTION1(_vm->_globals._gestureBuf, "12,11,10,9,8,7,6,5,4,3,2,1,0,-1,", 0, 0, 8); break; case 4: - ACTION(_vm->_globals.GESTE, "0,1,2,3,4,5,6,7,8,8,8,8,8,8,9,10,11,12,13,12,11,12,13,12,11,12,13,12,11,10,9,8,7,6,5,4,3,2,1,0,-1,", 0, 0, 8, false); + ACTION(_vm->_globals._gestureBuf, "0,1,2,3,4,5,6,7,8,8,8,8,8,8,9,10,11,12,13,12,11,12,13,12,11,12,13,12,11,10,9,8,7,6,5,4,3,2,1,0,-1,", 0, 0, 8, false); break; case 5: - SPACTION(_vm->_globals.GESTE, "15,16,17,18,19,20,21,-1,", 0, 0, 8, false); + SPACTION(_vm->_globals._gestureBuf, "15,16,17,18,19,20,21,-1,", 0, 0, 8, false); break; case 6: - SPACTION1(_vm->_globals.GESTE, "20,19,18,17,16,15,-1,", 0, 0, 8); + SPACTION1(_vm->_globals._gestureBuf, "20,19,18,17,16,15,-1,", 0, 0, 8); break; case 7: - SPACTION(_vm->_globals.GESTE, "15,16,17,18,19,20,21,22,23,24,-1,", 0, 0, 8, false); + SPACTION(_vm->_globals._gestureBuf, "15,16,17,18,19,20,21,22,23,24,-1,", 0, 0, 8, false); break; case 8: - SPACTION1(_vm->_globals.GESTE, "23,22,21,20,19,18,17,16,15,-1,", 0, 0, 8); + SPACTION1(_vm->_globals._gestureBuf, "23,22,21,20,19,18,17,16,15,-1,", 0, 0, 8); break; case 9: - SPACTION(_vm->_globals.GESTE, "15,16,17,18,19,20,21,22,23,24,-1,", 0, 0, 8, false); + SPACTION(_vm->_globals._gestureBuf, "15,16,17,18,19,20,21,22,23,24,-1,", 0, 0, 8, false); break; case 10: - SPACTION1(_vm->_globals.GESTE, "23,22,21,20,19,18,17,16,15,-1,", 0, 0, 8); + SPACTION1(_vm->_globals._gestureBuf, "23,22,21,20,19,18,17,16,15,-1,", 0, 0, 8); break; } } -void ObjectsManager::ACTION_DROITE(int idx) { - if (_vm->_globals.GESTE_FLAG != 3) { - _vm->_globals.GESTE = _vm->_globals.freeMemory(_vm->_globals.GESTE); - _vm->_globals.GESTE_FLAG = 3; - _vm->_globals.GESTE = _vm->_fileManager.loadFile("PROFIL.SPR"); +void ObjectsManager::doActionRight(int idx) { + if (_vm->_globals._curGestureFile != 3) { + _vm->_globals._gestureBuf = _vm->_globals.freeMemory(_vm->_globals._gestureBuf); + _vm->_globals._curGestureFile = 3; + _vm->_globals._gestureBuf = _vm->_fileManager.loadFile("PROFIL.SPR"); } switch (idx) { case 1: - ACTION(_vm->_globals.GESTE, "20,19,18,17,16,15,14,13,13,13,13,13,14,15,16,17,18,19,20,-1,", 0, 0, 8, false); + ACTION(_vm->_globals._gestureBuf, "20,19,18,17,16,15,14,13,13,13,13,13,14,15,16,17,18,19,20,-1,", 0, 0, 8, false); break; case 2: - SPACTION(_vm->_globals.GESTE, "1,2,3,4,5,6,7,8,-1,", 0, 0, 8, false); + SPACTION(_vm->_globals._gestureBuf, "1,2,3,4,5,6,7,8,-1,", 0, 0, 8, false); break; case 3: - SPACTION1(_vm->_globals.GESTE, "9,10,11,12,13,14,15,16,17,18,19,20,-1,", 0, 0, 8); + SPACTION1(_vm->_globals._gestureBuf, "9,10,11,12,13,14,15,16,17,18,19,20,-1,", 0, 0, 8); break; case 4: - ACTION(_vm->_globals.GESTE, "1,2,3,4,5,6,7,8,8,7,6,5,4,3,2,1,-1,", 0, 0, 8, false); + ACTION(_vm->_globals._gestureBuf, "1,2,3,4,5,6,7,8,8,7,6,5,4,3,2,1,-1,", 0, 0, 8, false); break; case 5: - SPACTION(_vm->_globals.GESTE, "23,24,25,-1,", 0, 0, 8, false); + SPACTION(_vm->_globals._gestureBuf, "23,24,25,-1,", 0, 0, 8, false); break; case 6: - SPACTION1(_vm->_globals.GESTE, "24,,23,-1,", 0, 0, 8); + SPACTION1(_vm->_globals._gestureBuf, "24,,23,-1,", 0, 0, 8); break; case 7: - SPACTION(_vm->_globals.GESTE, "23,24,25,26,27,-1,", 0, 0, 8, false); + SPACTION(_vm->_globals._gestureBuf, "23,24,25,26,27,-1,", 0, 0, 8, false); break; case 8: - SPACTION1(_vm->_globals.GESTE, "26,25,24,23,-1,", 0, 0, 8); + SPACTION1(_vm->_globals._gestureBuf, "26,25,24,23,-1,", 0, 0, 8); break; case 9: - SPACTION(_vm->_globals.GESTE, "23,24,25,26,27,28,29,-1,", 0, 0, 8, false); + SPACTION(_vm->_globals._gestureBuf, "23,24,25,26,27,28,29,-1,", 0, 0, 8, false); break; case 10: - SPACTION1(_vm->_globals.GESTE, "28,27,26,25,24,23,-1,", 0, 0, 8); + SPACTION1(_vm->_globals._gestureBuf, "28,27,26,25,24,23,-1,", 0, 0, 8); break; } } -void ObjectsManager::Q_DROITE(int idx) { - if (_vm->_globals.GESTE_FLAG != 4) { - _vm->_globals.GESTE = _vm->_globals.freeMemory(_vm->_globals.GESTE); - _vm->_globals.GESTE_FLAG = 4; - _vm->_globals.GESTE = _vm->_fileManager.loadFile("3Q.SPR"); +void ObjectsManager::doActionDiagRight(int idx) { + if (_vm->_globals._curGestureFile != 4) { + _vm->_globals._gestureBuf = _vm->_globals.freeMemory(_vm->_globals._gestureBuf); + _vm->_globals._curGestureFile = 4; + _vm->_globals._gestureBuf = _vm->_fileManager.loadFile("3Q.SPR"); } switch (idx) { case 1: - ACTION(_vm->_globals.GESTE, "0,1,2,3,4,5,6,7,8,8,8,8,8,7,6,5,4,3,2,1,0,-1,", 0, 0, 8, false); + ACTION(_vm->_globals._gestureBuf, "0,1,2,3,4,5,6,7,8,8,8,8,8,7,6,5,4,3,2,1,0,-1,", 0, 0, 8, false); break; case 2: - SPACTION(_vm->_globals.GESTE, "0,1,2,3,4,5,6,7,8,9,10,11,12,-1,", 0, 0, 8, false); + SPACTION(_vm->_globals._gestureBuf, "0,1,2,3,4,5,6,7,8,9,10,11,12,-1,", 0, 0, 8, false); break; case 3: - SPACTION1(_vm->_globals.GESTE, "11,10,9,8,7,6,5,4,3,2,1,0,-1,", 0, 0, 8); + SPACTION1(_vm->_globals._gestureBuf, "11,10,9,8,7,6,5,4,3,2,1,0,-1,", 0, 0, 8); break; case 4: - ACTION(_vm->_globals.GESTE, "0,1,2,3,4,5,6,7,8,9,10,11,12,11,12,11,12,11,12,11,10,9,8,7,6,5,4,3,2,1,0,-1,", 0, 0, 8, false); + ACTION(_vm->_globals._gestureBuf, "0,1,2,3,4,5,6,7,8,9,10,11,12,11,12,11,12,11,12,11,10,9,8,7,6,5,4,3,2,1,0,-1,", 0, 0, 8, false); break; case 5: - SPACTION(_vm->_globals.GESTE, "15,16,17,18,-1,", 0, 0, 8, false); + SPACTION(_vm->_globals._gestureBuf, "15,16,17,18,-1,", 0, 0, 8, false); break; case 6: - SPACTION1(_vm->_globals.GESTE, "17,16,15,-1,", 0, 0, 8); + SPACTION1(_vm->_globals._gestureBuf, "17,16,15,-1,", 0, 0, 8); break; case 7: - SPACTION(_vm->_globals.GESTE, "15,16,17,18,19,20-1,", 0, 0, 8, false); + SPACTION(_vm->_globals._gestureBuf, "15,16,17,18,19,20-1,", 0, 0, 8, false); break; case 8: - SPACTION1(_vm->_globals.GESTE, "19,18,17,16,15,-1,", 0, 0, 8); + SPACTION1(_vm->_globals._gestureBuf, "19,18,17,16,15,-1,", 0, 0, 8); break; case 9: - SPACTION(_vm->_globals.GESTE, "15,16,17,18,19,20,21,-1,", 0, 0, 8, false); + SPACTION(_vm->_globals._gestureBuf, "15,16,17,18,19,20,21,-1,", 0, 0, 8, false); break; case 10: - SPACTION1(_vm->_globals.GESTE, "20,19,18,17,15,-1,", 0, 0, 8); + SPACTION1(_vm->_globals._gestureBuf, "20,19,18,17,15,-1,", 0, 0, 8); break; } } -void ObjectsManager::ACTION_FACE(int idx) { - if (_vm->_globals.GESTE_FLAG != 2) { - _vm->_globals.GESTE = _vm->_globals.freeMemory(_vm->_globals.GESTE); - _vm->_globals.GESTE_FLAG = 2; - _vm->_globals.GESTE = _vm->_fileManager.loadFile("FACE.SPR"); +void ObjectsManager::doActionFront(int idx) { + if (_vm->_globals._curGestureFile != 2) { + _vm->_globals._gestureBuf = _vm->_globals.freeMemory(_vm->_globals._gestureBuf); + _vm->_globals._curGestureFile = 2; + _vm->_globals._gestureBuf = _vm->_fileManager.loadFile("FACE.SPR"); } switch (idx) { case 1: - ACTION(_vm->_globals.GESTE, "0,1,2,3,4,5,6,7,9,9,9,9,9,9,7,6,5,4,3,2,1,0,-1,", 0, 0, 8, false); + ACTION(_vm->_globals._gestureBuf, "0,1,2,3,4,5,6,7,9,9,9,9,9,9,7,6,5,4,3,2,1,0,-1,", 0, 0, 8, false); break; case 2: - SPACTION(_vm->_globals.GESTE, "0,1,2,3,4,5,6,7,9,10,11,12,13,14,15,-1,", 0, 0, 8, false); + SPACTION(_vm->_globals._gestureBuf, "0,1,2,3,4,5,6,7,9,10,11,12,13,14,15,-1,", 0, 0, 8, false); break; case 3: - SPACTION1(_vm->_globals.GESTE, "14,13,12,11,10,9,7,6,5,4,3,2,1,0,-1,", 0, 0, 8); + SPACTION1(_vm->_globals._gestureBuf, "14,13,12,11,10,9,7,6,5,4,3,2,1,0,-1,", 0, 0, 8); break; case 4: - ACTION(_vm->_globals.GESTE, "0,1,2,3,4,5,6,7,9,10,11,12,13,14,13,12,11,10,9,7,6,5,4,3,2,1,0,-1,", 0, 0, 8, false); + ACTION(_vm->_globals._gestureBuf, "0,1,2,3,4,5,6,7,9,10,11,12,13,14,13,12,11,10,9,7,6,5,4,3,2,1,0,-1,", 0, 0, 8, false); break; } } -void ObjectsManager::Q_GAUCHE(int idx) { - if (_vm->_globals.GESTE_FLAG != 4) { - _vm->_globals.GESTE = _vm->_globals.freeMemory(_vm->_globals.GESTE); - _vm->_globals.GESTE_FLAG = 4; - _vm->_globals.GESTE = _vm->_fileManager.loadFile("3Q.SPR"); +void ObjectsManager::doActionDiagLeft(int idx) { + if (_vm->_globals._curGestureFile != 4) { + _vm->_globals._gestureBuf = _vm->_globals.freeMemory(_vm->_globals._gestureBuf); + _vm->_globals._curGestureFile = 4; + _vm->_globals._gestureBuf = _vm->_fileManager.loadFile("3Q.SPR"); } switch (idx) { case 1: - ACTION(_vm->_globals.GESTE, "0,1,2,3,4,5,6,7,8,8,8,8,8,7,6,5,4,3,2,1,0,-1,", 0, 0, 8, true); + ACTION(_vm->_globals._gestureBuf, "0,1,2,3,4,5,6,7,8,8,8,8,8,7,6,5,4,3,2,1,0,-1,", 0, 0, 8, true); break; case 2: - SPACTION(_vm->_globals.GESTE, "0,1,2,3,4,5,6,7,8,9,10,11,12,-1,", 0, 0, 8, true); + SPACTION(_vm->_globals._gestureBuf, "0,1,2,3,4,5,6,7,8,9,10,11,12,-1,", 0, 0, 8, true); break; case 3: - SPACTION1(_vm->_globals.GESTE, "11,10,9,8,7,6,5,4,3,2,1,0,-1,", 0, 0, 8); + SPACTION1(_vm->_globals._gestureBuf, "11,10,9,8,7,6,5,4,3,2,1,0,-1,", 0, 0, 8); break; case 4: - ACTION(_vm->_globals.GESTE, "0,1,2,3,4,5,6,7,8,9,10,11,12,11,12,11,12,11,12,11,10,9,8,7,6,5,4,3,2,1,0,-1,", 0, 0, 8, true); + ACTION(_vm->_globals._gestureBuf, "0,1,2,3,4,5,6,7,8,9,10,11,12,11,12,11,12,11,12,11,10,9,8,7,6,5,4,3,2,1,0,-1,", 0, 0, 8, true); break; case 5: - SPACTION(_vm->_globals.GESTE, "15,16,17,18,-1,", 0, 0, 8, true); + SPACTION(_vm->_globals._gestureBuf, "15,16,17,18,-1,", 0, 0, 8, true); break; case 6: - SPACTION1(_vm->_globals.GESTE, "17,16,15,-1,", 0, 0, 8); + SPACTION1(_vm->_globals._gestureBuf, "17,16,15,-1,", 0, 0, 8); break; case 7: - SPACTION(_vm->_globals.GESTE, "15,16,17,18,19,20,-1,", 0, 0, 8, true); + SPACTION(_vm->_globals._gestureBuf, "15,16,17,18,19,20,-1,", 0, 0, 8, true); break; case 8: - SPACTION1(_vm->_globals.GESTE, "19,18,17,16,15,-1,", 0, 0, 8); + SPACTION1(_vm->_globals._gestureBuf, "19,18,17,16,15,-1,", 0, 0, 8); break; case 9: - SPACTION(_vm->_globals.GESTE, "15,16,17,18,19,20,21,-1,", 0, 0, 8, true); + SPACTION(_vm->_globals._gestureBuf, "15,16,17,18,19,20,21,-1,", 0, 0, 8, true); break; case 10: - SPACTION1(_vm->_globals.GESTE, "20,19,18,17,15,-1,", 0, 0, 8); + SPACTION1(_vm->_globals._gestureBuf, "20,19,18,17,15,-1,", 0, 0, 8); break; } } -void ObjectsManager::ACTION_GAUCHE(int idx) { - if (_vm->_globals.GESTE_FLAG != 3) { - _vm->_globals.GESTE = _vm->_globals.freeMemory(_vm->_globals.GESTE); - _vm->_globals.GESTE_FLAG = 3; - _vm->_globals.GESTE = _vm->_fileManager.loadFile("PROFIL.SPR"); +void ObjectsManager::doActionLeft(int idx) { + if (_vm->_globals._curGestureFile != 3) { + _vm->_globals._gestureBuf = _vm->_globals.freeMemory(_vm->_globals._gestureBuf); + _vm->_globals._curGestureFile = 3; + _vm->_globals._gestureBuf = _vm->_fileManager.loadFile("PROFIL.SPR"); } switch (idx) { case 1: - ACTION(_vm->_globals.GESTE, "20,19,18,17,16,15,14,13,13,13,13,13,14,15,16,17,18,19,20,-1,", 0, 0, 8, true); + ACTION(_vm->_globals._gestureBuf, "20,19,18,17,16,15,14,13,13,13,13,13,14,15,16,17,18,19,20,-1,", 0, 0, 8, true); break; case 2: - SPACTION(_vm->_globals.GESTE, "1,2,3,4,5,6,7,8,-1,", 0, 0, 8, true); + SPACTION(_vm->_globals._gestureBuf, "1,2,3,4,5,6,7,8,-1,", 0, 0, 8, true); break; case 3: - SPACTION1(_vm->_globals.GESTE, "9,10,11,12,13,14,15,16,17,18,19,20,-1,", 0, 0, 8); + SPACTION1(_vm->_globals._gestureBuf, "9,10,11,12,13,14,15,16,17,18,19,20,-1,", 0, 0, 8); break; case 4: - ACTION(_vm->_globals.GESTE, "1,2,3,4,5,6,7,8,8,7,6,5,4,3,2,1,-1,", 0, 0, 8, true); + ACTION(_vm->_globals._gestureBuf, "1,2,3,4,5,6,7,8,8,7,6,5,4,3,2,1,-1,", 0, 0, 8, true); break; case 5: - SPACTION(_vm->_globals.GESTE, "23,24,25,-1,", 0, 0, 8, true); + SPACTION(_vm->_globals._gestureBuf, "23,24,25,-1,", 0, 0, 8, true); break; case 6: - SPACTION1(_vm->_globals.GESTE, "24,,23,-1,", 0, 0, 8); + SPACTION1(_vm->_globals._gestureBuf, "24,,23,-1,", 0, 0, 8); break; case 7: - SPACTION(_vm->_globals.GESTE, "23,24,25,26,27,-1,", 0, 0, 8, true); + SPACTION(_vm->_globals._gestureBuf, "23,24,25,26,27,-1,", 0, 0, 8, true); break; case 8: - SPACTION1(_vm->_globals.GESTE, "26,25,24,23,-1,", 0, 0, 8); + SPACTION1(_vm->_globals._gestureBuf, "26,25,24,23,-1,", 0, 0, 8); break; case 9: - SPACTION(_vm->_globals.GESTE, "23,24,25,26,27,28,29,-1,", 0, 0, 8, true); + SPACTION(_vm->_globals._gestureBuf, "23,24,25,26,27,28,29,-1,", 0, 0, 8, true); break; case 10: - SPACTION1(_vm->_globals.GESTE, "28,27,26,25,24,23,-1,", 0, 0, 8); + SPACTION1(_vm->_globals._gestureBuf, "28,27,26,25,24,23,-1,", 0, 0, 8); break; } } diff --git a/engines/hopkins/objects.h b/engines/hopkins/objects.h index 7448040862..7093092bc2 100644 --- a/engines/hopkins/objects.h +++ b/engines/hopkins/objects.h @@ -217,6 +217,11 @@ public: void setOffsetXY(byte *data, int idx, int xp, int yp, bool isSize); void setVerb(int id); + void doActionBack(int idx); + void doActionRight(int idx); + void doActionFront(int idx); + void doActionLeft(int idx); + void PERSONAGE(const Common::String &backgroundFile, const Common::String &linkFile, const Common::String &animFile, const Common::String &s4, int v, bool initializeScreen); void PERSONAGE2(const Common::String &backgroundFile, const Common::String &linkFile, @@ -230,12 +235,8 @@ public: void BOB_VIVANT(int idx); void VBOB(byte *src, int idx, int xp, int yp, int frameIndex); void VBOB_OFF(int idx); - void ACTION_DOS(int idx); - void ACTION_DROITE(int idx); - void Q_DROITE(int idx); - void ACTION_FACE(int idx); - void Q_GAUCHE(int idx); - void ACTION_GAUCHE(int idx); + void doActionDiagRight(int idx); + void doActionDiagLeft(int idx); void OPTI_ONE(int idx, int animIdx, int destPosi, int animAction); void SCI_OPTI_ONE(int idx, int animIdx, int a3, int a4); void GOHOME(); 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; -- cgit v1.2.3