ACCESS: add code to replace the checks on KEYBUFCNT

2 files changed, 6 insertions, 12 deletions

diff --git a/engines/access/amazon/amazon_game.cpp b/engines/access/amazon/amazon_game.cpp
index c575d8498c..6da895a1ce 100644
--- a/engines/access/amazon/amazon_game.cpp
+++ b/engines/access/amazon/amazon_game.cpp
@@ -253,8 +253,7 @@ void AmazonEngine::doTitle() {
 	_screen->forceFadeIn();
 	_sound->newMusic(1, 0);
 	_events->_vbCount = 700;
-	warning("TODO: check on KEYBUFCNT");
-	while (!shouldQuit() && (_events->_vbCount > 0) && (!_events->_leftButton) && (!_events->_rightButton)) {
+	while (!shouldQuit() && (_events->_vbCount > 0) && !_events->isKeyMousePressed()) {
 		_events->pollEvents();
 		g_system->delayMillis(10);
 	}
@@ -287,15 +286,9 @@ void AmazonEngine::doTitle() {
 	_pCount = 0;
 
 	while (!shouldQuit()) {
-		if (_events->_rightButton) {
-			_skipStart = true;
-			_room->clearRoom();
-			_events->showCursor();
-			return;
-		}
-
-		warning("TODO: check on KEYBUFCNT");
-		if (_events->_leftButton) {
+		if (!_events->isKeyMousePressed()) {
+			if (_events->_rightButton)
+				_skipStart = true;
 			_room->clearRoom();
 			_events->showCursor();
 			return;
diff --git a/engines/access/amazon/amazon_scripts.cpp b/engines/access/amazon/amazon_scripts.cpp
index 7ec0f95e08..30cd6c866c 100644
--- a/engines/access/amazon/amazon_scripts.cpp
+++ b/engines/access/amazon/amazon_scripts.cpp
@@ -1004,7 +1004,8 @@ void AmazonScripts::doCast(int param1) {
 		_vm->copyBlocks();
 
 		_vm->_events->pollEvents();
-		warning("TODO: check on KEYBUFCNT");
+		if (_vm->_events->isKeyMousePressed())
+			break;
 
 		if (_yCam < -7550) {
 			_vm->_events->_vbCount = 50;