[Scummvm-git-logs] scummvm master -> 5f61168179b3386352e71b5f42ca258c1d74715e

[neuromancer]

This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
27f98df5f4 FREESCAPE: allow to use click to skip screens when touchscreen is detected
5f61168179 FREESCAPE: allow to use click to skip screens when touchscreen is detected


Commit: 27f98df5f404db41e1194ebb7faa9f49d7a3e3da
    https://github.com/scummvm/scummvm/commit/27f98df5f404db41e1194ebb7faa9f49d7a3e3da
Author: neuromancer (gustavo.grieco at gmail.com)
Date: 2023-11-12T15:58:15+01:00

Commit Message:
FREESCAPE: allow to use click to skip screens when touchscreen is detected

Changed paths:
    engines/freescape/ui.cpp


diff --git a/engines/freescape/ui.cpp b/engines/freescape/ui.cpp
index ef63131db21..792b1972630 100644
--- a/engines/freescape/ui.cpp
+++ b/engines/freescape/ui.cpp
@@ -50,6 +50,12 @@ void FreescapeEngine::titleScreen() {
 					break;
 				}
 			break;
+			case Common::EVENT_RBUTTONDOWN:
+				// fallthrough
+			case Common::EVENT_LBUTTONDOWN:
+				if (g_system->hasFeature(OSystem::kFeatureTouchscreen))
+					i = maxWait;
+				break;
 			default:
 				break;
 			}
@@ -164,6 +170,13 @@ void FreescapeEngine::drawBorderScreenAndWait(Graphics::Surface *surface) {
 				default:
 					break;
 				}
+				break;
+			case Common::EVENT_RBUTTONDOWN:
+				// fallthrough
+			case Common::EVENT_LBUTTONDOWN:
+				if (g_system->hasFeature(OSystem::kFeatureTouchscreen))
+					i = maxWait;
+				break;
 			default:
 				break;
 			}


Commit: 5f61168179b3386352e71b5f42ca258c1d74715e
    https://github.com/scummvm/scummvm/commit/5f61168179b3386352e71b5f42ca258c1d74715e
Author: neuromancer (gustavo.grieco at gmail.com)
Date: 2023-11-12T15:58:15+01:00

Commit Message:
FREESCAPE: allow to use click to skip screens when touchscreen is detected

Changed paths:
    engines/freescape/games/dark/dark.cpp
    engines/freescape/games/driller/driller.cpp


diff --git a/engines/freescape/games/dark/dark.cpp b/engines/freescape/games/dark/dark.cpp
index 793c62887bd..6a2ad84dcbc 100644
--- a/engines/freescape/games/dark/dark.cpp
+++ b/engines/freescape/games/dark/dark.cpp
@@ -671,7 +671,12 @@ void DarkEngine::drawFullscreenMessageAndWait(Common::String message) {
 			case Common::EVENT_SCREEN_CHANGED:
 				_gfx->computeScreenViewport();
 				break;
-
+			case Common::EVENT_RBUTTONDOWN:
+				// fallthrough
+			case Common::EVENT_LBUTTONDOWN:
+				if (g_system->hasFeature(OSystem::kFeatureTouchscreen))
+					cont = false;
+				break;
 			default:
 				break;
 			}
diff --git a/engines/freescape/games/driller/driller.cpp b/engines/freescape/games/driller/driller.cpp
index fd2769eb641..77eb16ca36f 100644
--- a/engines/freescape/games/driller/driller.cpp
+++ b/engines/freescape/games/driller/driller.cpp
@@ -320,7 +320,12 @@ void DrillerEngine::drawInfoMenu() {
 				_gfx->computeScreenViewport();
 				// TODO: properly refresh screen
 				break;
-
+			case Common::EVENT_RBUTTONDOWN:
+			// fallthrough
+			case Common::EVENT_LBUTTONDOWN:
+				if (g_system->hasFeature(OSystem::kFeatureTouchscreen))
+					cont = false;
+				break;
 			default:
 				break;
 			}