ILLUSIONS: Minor cleanup: Remove empty methods in thread classes

8 files changed, 0 insertions, 68 deletions

diff --git a/engines/illusions/threads/abortablethread.cpp b/engines/illusions/threads/abortablethread.cpp
index acbc1adea2..d2fc8076ff 100644
--- a/engines/illusions/threads/abortablethread.cpp
+++ b/engines/illusions/threads/abortablethread.cpp
@@ -51,19 +51,4 @@ int AbortableThread::onUpdate() {
 	return kTSYield;
 }
 
-void AbortableThread::onSuspend() {
-}
-
-void AbortableThread::onNotify() {
-}
-
-void AbortableThread::onPause() {
-}
-
-void AbortableThread::onResume() {
-}
-
-void AbortableThread::onTerminated() {
-}
-
 } // End of namespace Illusions
diff --git a/engines/illusions/threads/abortablethread.h b/engines/illusions/threads/abortablethread.h
index 8fc2a47fce..96ec9dc156 100644
--- a/engines/illusions/threads/abortablethread.h
+++ b/engines/illusions/threads/abortablethread.h
@@ -34,11 +34,6 @@ public:
 	AbortableThread(IllusionsEngine *vm, uint32 threadId, uint32 callingThreadId, uint notifyFlags,
 		uint32 scriptThreadId, byte *scriptCodeIp);
 	virtual int onUpdate();
-	virtual void onSuspend();
-	virtual void onNotify();
-	virtual void onPause();
-	virtual void onResume();
-	virtual void onTerminated();
 public:
 	int _status;
 	byte *_scriptCodeIp;
diff --git a/engines/illusions/threads/talkthread.cpp b/engines/illusions/threads/talkthread.cpp
index c60bc5d8bf..e9c3e36aee 100644
--- a/engines/illusions/threads/talkthread.cpp
+++ b/engines/illusions/threads/talkthread.cpp
@@ -80,7 +80,6 @@ TalkThread::TalkThread(IllusionsEngine *vm, uint32 threadId, uint32 callingThrea
 			_sceneId = callingThread->_sceneId;
 	}
 
-	//debug("New talk thread: %08X %08X", _threadId, _talkId);
 }
 
 int TalkThread::onUpdate() {
@@ -245,21 +244,6 @@ if (true) {
 
 }
 
-void TalkThread::onSuspend() {
-}
-
-void TalkThread::onNotify() {
-}
-
-void TalkThread::onPause() {
-}
-
-void TalkThread::onResume() {
-}
-
-void TalkThread::onTerminated() {
-}
-
 void TalkThread::onKill() {
 	_callingThreadId = 0;
 	sendMessage(kMsgClearSequenceId1, 0);
@@ -313,30 +297,16 @@ static char *debugW2I(byte *wstr) {
 }
 
 int TalkThread::insertText() {
-/*
-	int charCount = 100;
-	debug("%08X %08X [%s]", _threadId, _talkId, debugW2I(_currEntryText));
-	_entryText = 0;
-	// TODO _vm->getDimensions1(&dimensions);
-	// TODO _vm->insertText(_currEntryText, _vm->_currFontId, dimensions, 0, 2, 0, 0, 0, 0, 0, 0, &outTextPtr);
-	// TODO _vm->charCount = (char *)outTextPtr - (char *)text;
-	// TODO _entryText = outTextPtr;
-	// TODO _vm->getPoint1(&pt);
-	// TODO _vm->updateTextInfoPosition(pt);
-	return charCount >> 1;
-*/	
 	debug("%08X %08X [%s]", _threadId, _talkId, debugW2I(_currEntryText));
 	WidthHeight dimensions;
 	_vm->getDefaultTextDimensions(dimensions);
 	uint16 *outTextPtr;
 	_vm->_screenText->insertText((uint16*)_currEntryText, 0x120001, dimensions,
-		//Common::Point(0, 0), 2, 0, 0, _color.r, _color.g, _color.b, outTextPtr);
 		Common::Point(0, 0), 2, 0, 0, 0, 0, 0, outTextPtr);
 	_entryText = (byte*)outTextPtr;
 	Common::Point pt;
 	_vm->getDefaultTextPosition(pt);
 	_vm->_screenText->updateTextInfoPosition(pt);
-	//_vm->_screenText->updateTextInfoPosition(Common::Point(320, 200));
 	int charCount = (_entryText - _currEntryText) / 2;
 	return charCount;
 }
diff --git a/engines/illusions/threads/talkthread.h b/engines/illusions/threads/talkthread.h
index ada593b571..1d6573c890 100644
--- a/engines/illusions/threads/talkthread.h
+++ b/engines/illusions/threads/talkthread.h
@@ -42,11 +42,6 @@ public:
 		int16 duration, uint32 objectId, uint32 talkId, uint32 sequenceId1, uint32 sequenceId2,
 		uint32 namedPointId);
 	virtual int onUpdate();
-	virtual void onSuspend();
-	virtual void onNotify();
-	virtual void onPause();
-	virtual void onResume();
-	virtual void onTerminated();
 	virtual void onKill();
 	virtual uint32 sendMessage(int msgNum, uint32 msgValue);
 public:
diff --git a/engines/illusions/threads/talkthread_duckman.cpp b/engines/illusions/threads/talkthread_duckman.cpp
index 0476c8f41f..f891301bf9 100644
--- a/engines/illusions/threads/talkthread_duckman.cpp
+++ b/engines/illusions/threads/talkthread_duckman.cpp
@@ -203,12 +203,6 @@ int TalkThread_Duckman::onUpdate() {
 
 }
 
-void TalkThread_Duckman::onSuspend() {
-}
-
-void TalkThread_Duckman::onNotify() {
-}
-
 void TalkThread_Duckman::onPause() {
 	if (_status == 5) {
 		if (!(_flags & 4)) {
diff --git a/engines/illusions/threads/talkthread_duckman.h b/engines/illusions/threads/talkthread_duckman.h
index 6f4758dc33..9c710e32f5 100644
--- a/engines/illusions/threads/talkthread_duckman.h
+++ b/engines/illusions/threads/talkthread_duckman.h
@@ -41,8 +41,6 @@ public:
 	TalkThread_Duckman(IllusionsEngine_Duckman *vm, uint32 threadId, uint32 callingThreadId, uint notifyFlags,
 		uint32 objectId, uint32 talkId, uint32 sequenceId1, uint32 sequenceId2);
 	virtual int onUpdate();
-	virtual void onSuspend();
-	virtual void onNotify();
 	virtual void onPause();
 	virtual void onUnpause();
 	virtual void onResume();
diff --git a/engines/illusions/threads/timerthread.cpp b/engines/illusions/threads/timerthread.cpp
index de1502d9f2..1f9a63b45d 100644
--- a/engines/illusions/threads/timerthread.cpp
+++ b/engines/illusions/threads/timerthread.cpp
@@ -77,8 +77,4 @@ void TimerThread::onResume() {
 	onNotify();
 }
 
-void TimerThread::onTerminated() {
-	// Empty
-}
-
 } // End of namespace Illusions
diff --git a/engines/illusions/threads/timerthread.h b/engines/illusions/threads/timerthread.h
index 7e1b61319b..6f4aba99cf 100644
--- a/engines/illusions/threads/timerthread.h
+++ b/engines/illusions/threads/timerthread.h
@@ -39,7 +39,6 @@ public:
 	virtual void onPause();
 	virtual void onUnpause();
 	virtual void onResume();
-	virtual void onTerminated();
 public:
 	uint32 _startTime, _endTime;
 	uint32 _duration, _durationElapsed;