ILLUSIONS: Replace 0x40004 with CURSOR_OBJECT_ID constant

Fix pan bug in starship enterprise scene
Add sequence opcode name to debug log
Hack to fix endless loop bug outside the starship enterprise

3 files changed, 8 insertions, 8 deletions

diff --git a/engines/illusions/duckman/duckman_dialog.cpp b/engines/illusions/duckman/duckman_dialog.cpp
index 3e42955ac9..f624ed8d01 100644
--- a/engines/illusions/duckman/duckman_dialog.cpp
+++ b/engines/illusions/duckman/duckman_dialog.cpp
@@ -85,8 +85,8 @@ void DuckmanDialogSystem::startDialog(int16 *choiceOfsPtr, uint32 actorTypeId, u
 	} else {
 		if (!_vm->_cursor._control) {
 			Common::Point pos = _vm->getNamedPointPosition(0x70001);
-			_vm->_controls->placeActor(0x50001, pos, 0x60001, 0x40004, 0);
-			_vm->_cursor._control = _vm->_dict->getObjectControl(0x40004);
+			_vm->_controls->placeActor(0x50001, pos, 0x60001, Illusions::CURSOR_OBJECT_ID, 0);
+			_vm->_cursor._control = _vm->_dict->getObjectControl(Illusions::CURSOR_OBJECT_ID);
 		}
 		_vm->_cursor._control->appearActor();
 		_vm->setCursorActorIndex(6, 1, 0);
diff --git a/engines/illusions/duckman/illusions_duckman.cpp b/engines/illusions/duckman/illusions_duckman.cpp
index 325b6dca87..0b2bcca52f 100644
--- a/engines/illusions/duckman/illusions_duckman.cpp
+++ b/engines/illusions/duckman/illusions_duckman.cpp
@@ -944,13 +944,13 @@ void IllusionsEngine_Duckman::pause(uint32 callerThreadId) {
 		_threads->pauseThreads(callerThreadId);
 		_camera->pause();
 		pauseFader();
-		// TODO largeObj_pauseControlActor(0x40004);
+		// TODO largeObj_pauseControlActor(Illusions::CURSOR_OBJECT_ID);
 	}
 }
 
 void IllusionsEngine_Duckman::unpause(uint32 callerThreadId) {
 	if (--_pauseCtr == 0) {
-		// TODO largeObj_unpauseControlActor(0x40004);
+		// TODO largeObj_unpauseControlActor(Illusions::CURSOR_OBJECT_ID);
 		unpauseFader();
 		_camera->unpause();
 		_threads->unpauseThreads(callerThreadId);
diff --git a/engines/illusions/duckman/menusystem_duckman.cpp b/engines/illusions/duckman/menusystem_duckman.cpp
index 621a49cd1f..263cda83ce 100644
--- a/engines/illusions/duckman/menusystem_duckman.cpp
+++ b/engines/illusions/duckman/menusystem_duckman.cpp
@@ -171,15 +171,15 @@ int DuckmanMenuSystem::convertRootMenuId(uint32 menuId) {
 
 bool DuckmanMenuSystem::initMenuCursor() {
 	bool cursorInitialVisibleFlag = false;
-	Control *cursorControl = _vm->getObjectControl(0x40004);
+	Control *cursorControl = _vm->getObjectControl(Illusions::CURSOR_OBJECT_ID);
 	if (cursorControl) {
 		if (cursorControl->_flags & 1)
 			cursorInitialVisibleFlag = false;
 		cursorControl->appearActor();
 	} else {
 		Common::Point pos = _vm->getNamedPointPosition(0x70001);
-		_vm->_controls->placeActor(0x50001, pos, 0x60001, 0x40004, 0);
-		cursorControl = _vm->getObjectControl(0x40004);
+		_vm->_controls->placeActor(0x50001, pos, 0x60001, Illusions::CURSOR_OBJECT_ID, 0);
+		cursorControl = _vm->getObjectControl(Illusions::CURSOR_OBJECT_ID);
 	}
 	return cursorInitialVisibleFlag;
 }
@@ -189,7 +189,7 @@ int DuckmanMenuSystem::getGameState() {
 }
 
 void DuckmanMenuSystem::setMenuCursorNum(int cursorNum) {
-	Control *mouseCursor = _vm->getObjectControl(0x40004);
+	Control *mouseCursor = _vm->getObjectControl(Illusions::CURSOR_OBJECT_ID);
 	_vm->setCursorActorIndex(5, cursorNum, 0);
 	mouseCursor->startSequenceActor(0x60001, 2, 0);
 }