[Scummvm-cvs-logs] scummvm master -> 0699c98b0b8ba57941224b9da7d78462021465a9

[Strangerke]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
0699c98b0b HOPKINS: Some renaming in ObjectsManager


Commit: 0699c98b0b8ba57941224b9da7d78462021465a9
    https://github.com/scummvm/scummvm/commit/0699c98b0b8ba57941224b9da7d78462021465a9
Author: Strangerke (strangerke at scummvm.org)
Date: 2013-04-01T14:58:50-07:00

Commit Message:
HOPKINS: Some renaming in ObjectsManager

Changed paths:
    engines/hopkins/objects.cpp
    engines/hopkins/objects.h
    engines/hopkins/script.cpp



diff --git a/engines/hopkins/objects.cpp b/engines/hopkins/objects.cpp
index c6a4910..b6c1f62 100644
--- a/engines/hopkins/objects.cpp
+++ b/engines/hopkins/objects.cpp
@@ -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;
 
diff --git a/engines/hopkins/objects.h b/engines/hopkins/objects.h
index 3c8cdeb..efa468e 100644
--- a/engines/hopkins/objects.h
+++ b/engines/hopkins/objects.h
@@ -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();
 };
 
diff --git a/engines/hopkins/script.cpp b/engines/hopkins/script.cpp
index 3d5d5f4..9c30f59 100644
--- a/engines/hopkins/script.cpp
+++ b/engines/hopkins/script.cpp
@@ -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)