ILLUSIONS: Refactor the input system

5 files changed, 13 insertions, 13 deletions

diff --git a/engines/illusions/threads/abortablethread.cpp b/engines/illusions/threads/abortablethread.cpp
index 348bc9c49a..b06debe014 100644
--- a/engines/illusions/threads/abortablethread.cpp
+++ b/engines/illusions/threads/abortablethread.cpp
@@ -35,13 +35,13 @@ AbortableThread::AbortableThread(IllusionsEngine *vm, uint32 threadId, uint32 ca
 	_scriptCodeIp(scriptCodeIp), _status(1) {
 	_type = kTTAbortableThread;
 	_tag = _vm->getCurrentScene();
-	_vm->_input->discardButtons(8);
+	_vm->_input->discardEvent(kEventAbort);
 }
 
 int AbortableThread::onUpdate() {
 	if (_status != 1 || _pauseCtr < 0)
 		return kTSTerminate;
-	if (_vm->_input->pollButton(8)) {
+	if (_vm->_input->pollEvent(kEventAbort)) {
 		_vm->_threads->killThread(_scriptThreadId);
 		++_pauseCtr;
 		_vm->startTempScriptThread(_scriptCodeIp, _threadId, 0, 0, 0);
diff --git a/engines/illusions/threads/causethread_duckman.cpp b/engines/illusions/threads/causethread_duckman.cpp
index df5b1fa67c..ee5fe75222 100644
--- a/engines/illusions/threads/causethread_duckman.cpp
+++ b/engines/illusions/threads/causethread_duckman.cpp
@@ -41,14 +41,14 @@ int CauseThread_Duckman::onUpdate() {
 		if (_vm->getCurrentScene() == _tag) {
 			Control *cursorCursor = _vm->getObjectControl(0x40004);
 			cursorCursor->appearActor();
-			_vm->_input->discardButtons(1);
+			_vm->_input->discardEvent(kEventLeftClick);
 		}
 		return kTSTerminate;
 	} else {
 		_tag = _vm->getCurrentScene();
 		Control *cursorCursor = _vm->getObjectControl(0x40004);
 		cursorCursor->disappearActor();
-		_vm->_input->discardButtons(1);
+		_vm->_input->discardEvent(kEventLeftClick);
 		_vm->startScriptThread(_triggerThreadId, _threadId);
 		_flag = true;
 		return kTSSuspend;
diff --git a/engines/illusions/threads/talkthread.cpp b/engines/illusions/threads/talkthread.cpp
index 54bc207a14..4fbb5a2393 100644
--- a/engines/illusions/threads/talkthread.cpp
+++ b/engines/illusions/threads/talkthread.cpp
@@ -151,7 +151,7 @@ int TalkThread::onUpdate() {
 			}
 			_vm->_soundMan->startVoice(255, panX);
 		}
-		_vm->_input->discardButtons(0x10);
+		_vm->_input->discardEvent(kEventSkip);
 		_status = 6;
 		return kTSYield;
 
@@ -162,7 +162,7 @@ int TalkThread::onUpdate() {
 			// TODO _vm->removeText();
 			if (_entryText && *_entryText) {
 				refreshText();
-				_vm->_input->discardButtons(0x10);
+				_vm->_input->discardEvent(kEventSkip);
 			} else {
 				_flags |= 8;
 			}
@@ -178,7 +178,7 @@ int TalkThread::onUpdate() {
 			}
 			_flags |= 2;
 		}
-		if (_objectId && _vm->_input->pollButton(0x10)) {
+		if (_objectId && _vm->_input->pollEvent(kEventSkip)) {
 			if (!(_flags & 8)) {
 				// TODO _vm->removeText();
 				if (_entryText && *_entryText)
@@ -205,7 +205,7 @@ int TalkThread::onUpdate() {
 			}
 		}
 		if ((_flags & 8) && (_flags & 2) && (_flags & 4)) {
-			_vm->_input->discardButtons(0x10);
+			_vm->_input->discardEvent(kEventSkip);
 			_status = 7;
 			return kTSTerminate;
 		}
diff --git a/engines/illusions/threads/talkthread_duckman.cpp b/engines/illusions/threads/talkthread_duckman.cpp
index 20df1e4612..f47dd7d903 100644
--- a/engines/illusions/threads/talkthread_duckman.cpp
+++ b/engines/illusions/threads/talkthread_duckman.cpp
@@ -133,7 +133,7 @@ int TalkThread_Duckman::onUpdate() {
 			}
 			_vm->_soundMan->startVoice(255, panX);
 		}
-		_vm->_input->discardButtons(0x20);
+		_vm->_input->discardEvent(kEventSkip);
 		_status = 5;
 		return kTSYield;
 
@@ -144,7 +144,7 @@ int TalkThread_Duckman::onUpdate() {
 			_vm->_screenText->removeText();
 			if (_entryText && *_entryText) {
 				refreshText();
-				_vm->_input->discardButtons(0x20);
+				_vm->_input->discardEvent(kEventSkip);
 			} else {
 				_flags |= 8;
 			}
@@ -157,7 +157,7 @@ int TalkThread_Duckman::onUpdate() {
 				_flags |= 2;
 			}
 		}
-		if (_objectId && _vm->_input->pollButton(0x20)) {
+		if (_objectId && _vm->_input->pollEvent(kEventSkip)) {
 			if (!(_flags & 8)) {
 				_vm->_screenText->removeText();
 				if (_entryText && *_entryText)
@@ -179,7 +179,7 @@ int TalkThread_Duckman::onUpdate() {
 			}
 		}
 		if ((_flags & 8) && (_flags & 2) && (_flags & 4)) {
-			_vm->_input->discardButtons(0x20);
+			_vm->_input->discardEvent(kEventSkip);
 			return kTSTerminate;
 		}
 		return kTSYield;
diff --git a/engines/illusions/threads/timerthread.cpp b/engines/illusions/threads/timerthread.cpp
index 714c719bc9..5842098739 100644
--- a/engines/illusions/threads/timerthread.cpp
+++ b/engines/illusions/threads/timerthread.cpp
@@ -46,7 +46,7 @@ TimerThread::TimerThread(IllusionsEngine *vm, uint32 threadId, uint32 callingThr
 
 int TimerThread::onUpdate() {
 	if (isTimerExpired(_startTime, _endTime) ||
-		(_isAbortable && _vm->_input->pollButton(8)))
+		(_isAbortable && _vm->_input->pollEvent(kEventAbort)))
 		return kTSTerminate;
 	return kTSYield;
 }