From 61a0b5badbd7098e0b96355a428408654b3705df Mon Sep 17 00:00:00 2001
From: johndoe123
Date: Thu, 19 Nov 2015 13:16:22 +0100
Subject: ILLUSIONS: Rename tag -> sceneId

---
 engines/illusions/threads/abortablethread.cpp     | 2 +-
 engines/illusions/threads/causethread_duckman.cpp | 6 +++---
 engines/illusions/threads/scriptthread.cpp        | 2 +-
 engines/illusions/threads/talkthread.cpp          | 2 +-
 engines/illusions/threads/talkthread_duckman.cpp  | 2 +-
 engines/illusions/threads/timerthread.cpp         | 2 +-
 6 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'engines/illusions/threads')

diff --git a/engines/illusions/threads/abortablethread.cpp b/engines/illusions/threads/abortablethread.cpp
index b06debe014..acbc1adea2 100644
--- a/engines/illusions/threads/abortablethread.cpp
+++ b/engines/illusions/threads/abortablethread.cpp
@@ -34,7 +34,7 @@ AbortableThread::AbortableThread(IllusionsEngine *vm, uint32 threadId, uint32 ca
 	: Thread(vm, threadId, callingThreadId, notifyFlags), _scriptThreadId(scriptThreadId), 
 	_scriptCodeIp(scriptCodeIp), _status(1) {
 	_type = kTTAbortableThread;
-	_tag = _vm->getCurrentScene();
+	_sceneId = _vm->getCurrentScene();
 	_vm->_input->discardEvent(kEventAbort);
 }
 
diff --git a/engines/illusions/threads/causethread_duckman.cpp b/engines/illusions/threads/causethread_duckman.cpp
index ee5fe75222..8fb836467a 100644
--- a/engines/illusions/threads/causethread_duckman.cpp
+++ b/engines/illusions/threads/causethread_duckman.cpp
@@ -33,19 +33,19 @@ CauseThread_Duckman::CauseThread_Duckman(IllusionsEngine_Duckman *vm, uint32 thr
 	uint32 triggerThreadId)
 	: Thread(vm, threadId, callingThreadId, notifyFlags), _vm(vm), _triggerThreadId(triggerThreadId), _flag(false) {
 	_type = kTTCauseThread;
-	_tag = _vm->getCurrentScene();
+	_sceneId = _vm->getCurrentScene();
 }
 
 int CauseThread_Duckman::onUpdate() {
 	if (_flag) {
-		if (_vm->getCurrentScene() == _tag) {
+		if (_vm->getCurrentScene() == _sceneId) {
 			Control *cursorCursor = _vm->getObjectControl(0x40004);
 			cursorCursor->appearActor();
 			_vm->_input->discardEvent(kEventLeftClick);
 		}
 		return kTSTerminate;
 	} else {
-		_tag = _vm->getCurrentScene();
+		_sceneId = _vm->getCurrentScene();
 		Control *cursorCursor = _vm->getObjectControl(0x40004);
 		cursorCursor->disappearActor();
 		_vm->_input->discardEvent(kEventLeftClick);
diff --git a/engines/illusions/threads/scriptthread.cpp b/engines/illusions/threads/scriptthread.cpp
index f8bbae9cb4..8fe3cddbff 100644
--- a/engines/illusions/threads/scriptthread.cpp
+++ b/engines/illusions/threads/scriptthread.cpp
@@ -33,7 +33,7 @@ ScriptThread::ScriptThread(IllusionsEngine *vm, uint32 threadId, uint32 callingT
 	: Thread(vm, threadId, callingThreadId, notifyFlags), _scriptCodeIp(scriptCodeIp), _value8(value8),
 	_valueC(valueC), _value10(value10), _sequenceStalled(0) {
 	_type = kTTScriptThread;
-	_tag = _vm->getCurrentScene();
+	_sceneId = _vm->getCurrentScene();
 }
 
 int ScriptThread::onUpdate() {
diff --git a/engines/illusions/threads/talkthread.cpp b/engines/illusions/threads/talkthread.cpp
index 7adf9e56bd..930b83c8fa 100644
--- a/engines/illusions/threads/talkthread.cpp
+++ b/engines/illusions/threads/talkthread.cpp
@@ -77,7 +77,7 @@ TalkThread::TalkThread(IllusionsEngine *vm, uint32 threadId, uint32 callingThrea
 	if (callingThreadId) {
 		Thread *callingThread = _vm->_threads->findThread(callingThreadId);
 		if (callingThread)
-			_tag = callingThread->_tag;
+			_sceneId = callingThread->_sceneId;
 	}
 
 	//debug("New talk thread: %08X %08X", _threadId, _talkId);
diff --git a/engines/illusions/threads/talkthread_duckman.cpp b/engines/illusions/threads/talkthread_duckman.cpp
index 6d8224e990..9b7ca4eefd 100644
--- a/engines/illusions/threads/talkthread_duckman.cpp
+++ b/engines/illusions/threads/talkthread_duckman.cpp
@@ -60,7 +60,7 @@ TalkThread_Duckman::TalkThread_Duckman(IllusionsEngine_Duckman *vm, uint32 threa
 	_textDuration = _durationMult;
 	_defDurationMult = _vm->clipTextDuration(240);
 	
-	_tag = _vm->getCurrentScene();
+	_sceneId = _vm->getCurrentScene();
 
 }
 
diff --git a/engines/illusions/threads/timerthread.cpp b/engines/illusions/threads/timerthread.cpp
index 5842098739..417d113210 100644
--- a/engines/illusions/threads/timerthread.cpp
+++ b/engines/illusions/threads/timerthread.cpp
@@ -39,7 +39,7 @@ TimerThread::TimerThread(IllusionsEngine *vm, uint32 threadId, uint32 callingThr
 	if (callingThreadId) {
 		Thread *callingThread = _vm->_threads->findThread(callingThreadId);
 		if (callingThread)
-			_tag = callingThread->_tag;
+			_sceneId = callingThread->_sceneId;
 	}
 
 }
-- 
cgit v1.2.3