libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-03-07 02:39:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

HOPKINS: Some renaming in ObjectsManager

Browse Source
This commit is contained in:
Strangerke 2013-04-01 23:58:03 +02:00
parent 8ffd6d4362
commit 0699c98b0b
3 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
engines/hopkins/objects.cpp
View File

@ -3358,22 +3358,18 @@ void ObjectsManager::sceneSpecialIni() {
}
}
void ObjectsManager::OPTI_BOBON(int idx1, int idx2, int idx3, int anim1Idx, int anim2Idx, int anim3Idx) {
void ObjectsManager::setMultiBobAnim(int idx1, int idx2, int anim1Idx, int anim2Idx) {
if (idx1 != -1)
setBobAnimation(idx1);
if (idx2 != -1)
setBobAnimation(idx2);
if (idx3 != -1)
setBobAnimation(idx3);
if (idx1 != -1)
setBobAnimDataIdx(idx1, anim1Idx);
if (idx2 != -1)
setBobAnimDataIdx(idx2, anim2Idx);
if (idx3 != -1)
setBobAnimDataIdx(idx3, anim3Idx);
}
void ObjectsManager::SCI_OPTI_ONE(int idx, int animIdx, int animDataIdx, int a4) {
void ObjectsManager::checkEventBobAnim(int idx, int animIdx, int animDataIdx, int a4) {
_vm->_eventsManager->_curMouseButton = 0;
_vm->_eventsManager->_mouseButton = 0;

4
engines/hopkins/objects.h
View File

@ -318,6 +318,8 @@ public:
void showSpecialActionAnimationWithFlip(byte *spriteData, const Common::String &animationSeq, int speed, bool flipFl);
void showSpecialActionAnimation(byte *spriteData, const Common::String &animString, int speed);
void checkEventBobAnim(int idx, int animIdx, int animDataIdx, int a4);
void setMultiBobAnim(int idx1, int idx2, int anim1Idx, int anim2Idx);
void PERSONAGE(const Common::String &backgroundFile, const Common::String &linkFile,
const Common::String &animFile, const Common::String &s4, int soundNum, bool initializeScreen);
@ -328,9 +330,7 @@ public:
void VBOB(byte *src, int idx, int xp, int yp, int frameIndex);
void VBOB_OFF(int idx);
void OPTI_ONE(int idx, int animIdx, int destPosi, int animAction);
void SCI_OPTI_ONE(int idx, int animIdx, int animDataIdx, int a4);
void GOHOME();
void OPTI_BOBON(int idx1, int idx2, int idx3, int anim1Idx, int anim2Idx, int anim3Idx);
void PARADISE();
};

6
engines/hopkins/script.cpp
View File

@ -602,7 +602,7 @@ int ScriptManager::handleOpcode(byte *dataP) {
_vm->_eventsManager->mouseOff();
_vm->_graphicsManager->fadeInDefaultLength(_vm->_graphicsManager->_frontBuffer);
_vm->_objectsManager->SCI_OPTI_ONE(1, 0, 17, 3);
_vm->_objectsManager->checkEventBobAnim(1, 0, 17, 3);
_vm->_graphicsManager->fadeOutDefaultLength(_vm->_graphicsManager->_frontBuffer);
_vm->_graphicsManager->endDisplayBob();
@ -773,7 +773,7 @@ int ScriptManager::handleOpcode(byte *dataP) {
_vm->_globals->_checkDistanceFl = true;
_vm->_soundManager->loadSample(1, "SOUND44.WAV");
_vm->_soundManager->loadSample(2, "SOUND45.WAV");
_vm->_objectsManager->OPTI_BOBON(9, 10, -1, 0, 0, 0);
_vm->_objectsManager->setMultiBobAnim(9, 10, 0, 0);
bool playFl = false;
for (;;) {
if (_vm->shouldQuit())
@ -842,7 +842,7 @@ int ScriptManager::handleOpcode(byte *dataP) {
case 49: {
_vm->_objectsManager->disableHidingBehavior();
_vm->_objectsManager->removeSprite(0);
_vm->_objectsManager->OPTI_BOBON(9, 10, -1, 0, 0, 0);
_vm->_objectsManager->setMultiBobAnim(9, 10, 0, 0);
int endIdx;
if (_vm->_globals->_saveData->_data[svField133] == 1)