ILLUSIONS: Rename tag -> sceneId

3 files changed, 17 insertions, 17 deletions

diff --git a/engines/illusions/bbdou/bbdou_specialcode.cpp b/engines/illusions/bbdou/bbdou_specialcode.cpp
index a7dadc487c..5257a48858 100644
--- a/engines/illusions/bbdou/bbdou_specialcode.cpp
+++ b/engines/illusions/bbdou/bbdou_specialcode.cpp
@@ -73,7 +73,7 @@ void CauseThread_BBDOU::onTerminated() {
 RadarMicrophoneThread::RadarMicrophoneThread(IllusionsEngine_BBDOU *vm, uint32 threadId,
 	uint32 callingThreadId, uint32 cursorObjectId)
 	: Thread(vm, threadId, callingThreadId, 0), _cursorObjectId(cursorObjectId), _zonesCount(0) {
-	_tag = _vm->getCurrentScene();
+	_sceneId = _vm->getCurrentScene();
 }
 
 int RadarMicrophoneThread::onUpdate() {
diff --git a/engines/illusions/bbdou/illusions_bbdou.cpp b/engines/illusions/bbdou/illusions_bbdou.cpp
index 98a4a24175..9c7e0192bb 100644
--- a/engines/illusions/bbdou/illusions_bbdou.cpp
+++ b/engines/illusions/bbdou/illusions_bbdou.cpp
@@ -260,8 +260,8 @@ void IllusionsEngine_BBDOU::initInput() {
 		.addKey(Common::KEYCODE_DOWN);
 }
 
-#define UPDATEFUNCTION(priority, tag, callback) \
-	_updateFunctions->add(priority, tag, new Common::Functor1Mem<uint, int, IllusionsEngine_BBDOU> \
+#define UPDATEFUNCTION(priority, sceneId, callback) \
+	_updateFunctions->add(priority, sceneId, new Common::Functor1Mem<uint, int, IllusionsEngine_BBDOU> \
 		(this, &IllusionsEngine_BBDOU::callback));
 
 void IllusionsEngine_BBDOU::initUpdateFunctions() {
@@ -516,30 +516,30 @@ bool IllusionsEngine_BBDOU::enterScene(uint32 sceneId, uint32 threadId) {
 void IllusionsEngine_BBDOU::exitScene(uint32 threadId) {
 	uint32 sceneId = _activeScenes.getCurrentScene();
 	// TODO krnfileDump(sceneId);
-	// TODO UpdateFunctions_disableByTag__TODO_maybe(sceneId);
-	_threads->terminateThreadsByTag(sceneId, threadId);
-	_controls->destroyControlsByTag(sceneId);
+	// TODO UpdateFunctions_disableBySceneId__TODO_maybe(sceneId);
+	_threads->terminateThreadsBySceneId(sceneId, threadId);
+	_controls->destroyControlsBySceneId(sceneId);
 	_triggerFunctions->removeBySceneId(sceneId);
-	_resSys->unloadResourcesByTag(sceneId);
+	_resSys->unloadResourcesBySceneId(sceneId);
 	_activeScenes.pop();
 }
 
 void IllusionsEngine_BBDOU::enterPause(uint32 threadId) {
 	uint32 sceneId = _activeScenes.getCurrentScene();
 	_camera->pushCameraMode();
-	_threads->suspendThreadsByTag(sceneId, threadId);
-	_controls->pauseControlsByTag(sceneId);
-	_actorInstances->pauseByTag(sceneId);
-	_backgroundInstances->pauseByTag(sceneId);
+	_threads->suspendThreadsBySceneId(sceneId, threadId);
+	_controls->pauseControlsBySceneId(sceneId);
+	_actorInstances->pauseBySceneId(sceneId);
+	_backgroundInstances->pauseBySceneId(sceneId);
 	_activeScenes.pauseActiveScene();
 }
 
 void IllusionsEngine_BBDOU::leavePause(uint32 threadId) {
 	uint32 sceneId = _activeScenes.getCurrentScene();
-	_backgroundInstances->unpauseByTag(sceneId);
-	_actorInstances->unpauseByTag(sceneId);
-	_controls->unpauseControlsByTag(sceneId);
-	_threads->notifyThreadsByTag(sceneId, threadId);
+	_backgroundInstances->unpauseBySceneId(sceneId);
+	_actorInstances->unpauseBySceneId(sceneId);
+	_controls->unpauseControlsBySceneId(sceneId);
+	_threads->notifyThreadsBySceneId(sceneId, threadId);
 	_camera->popCameraMode();
 	_activeScenes.unpauseActiveScene();
 }
diff --git a/engines/illusions/bbdou/scriptopcodes_bbdou.cpp b/engines/illusions/bbdou/scriptopcodes_bbdou.cpp
index efdc289c9b..945892f82f 100644
--- a/engines/illusions/bbdou/scriptopcodes_bbdou.cpp
+++ b/engines/illusions/bbdou/scriptopcodes_bbdou.cpp
@@ -279,7 +279,7 @@ void ScriptOpcodes_BBDOU::opStartModalScene(ScriptThread *scriptThread, OpCall &
 	// NOTE Skipped checking for stalled resources
 	_vm->_input->discardAllEvents();
 	_vm->enterPause(opCall._callerThreadId);
-	_vm->_talkItems->pauseByTag(_vm->getCurrentScene());
+	_vm->_talkItems->pauseBySceneId(_vm->getCurrentScene());
 	_vm->enterScene(sceneId, opCall._callerThreadId);
 	_vm->startScriptThread(threadId, 0,
 		scriptThread->_value8, scriptThread->_valueC, scriptThread->_value10);
@@ -291,7 +291,7 @@ void ScriptOpcodes_BBDOU::opExitModalScene(ScriptThread *scriptThread, OpCall &o
 	_vm->_input->discardAllEvents();
 	_vm->exitScene(opCall._callerThreadId);
 	_vm->leavePause(opCall._callerThreadId);
-	_vm->_talkItems->unpauseByTag(_vm->getCurrentScene());
+	_vm->_talkItems->unpauseBySceneId(_vm->getCurrentScene());
 }
 
 void ScriptOpcodes_BBDOU::opEnterCloseUpScene(ScriptThread *scriptThread, OpCall &opCall) {