[Scummvm-git-logs] scummvm branch-2-7 -> 91d4d1802c8557853f5a4090b17af1d2bd691886

[neuromancer]

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

Summary:
1e826024b2 HYPNO: check zero or negative health when showing message at the end of fight
7904fff686 HYPNO: enable kSupportsReturnToLauncher
91d4d1802c HYPNO: show virtual keyboard when a player name should be introduced


Commit: 1e826024b2a150de45f2f47530a2a58d99d82d0b
    https://github.com/scummvm/scummvm/commit/1e826024b2a150de45f2f47530a2a58d99d82d0b
Author: neuromancer (gustavo.grieco at gmail.com)
Date: 2023-03-20T08:59:53+01:00

Commit Message:
HYPNO: check zero or negative health when showing message at the end of fight

Changed paths:
    engines/hypno/spider/arcade.cpp


diff --git a/engines/hypno/spider/arcade.cpp b/engines/hypno/spider/arcade.cpp
index ad6d9dc8685..55e19ffd708 100644
--- a/engines/hypno/spider/arcade.cpp
+++ b/engines/hypno/spider/arcade.cpp
@@ -74,7 +74,7 @@ void SpiderEngine::runAfterArcade(ArcadeShooting *arc) {
 	_playerFrames.clear();
 
 	if (isDemo() && _restoredContentEnabled) {
-		if (_health == 0)
+		if (_health <= 0)
 			showScore("Spider-man was defeated!");
 		else
 			showScore("Spider-Man saved the day!");


Commit: 7904fff686da6a56b9674af36c833e58a8b403ce
    https://github.com/scummvm/scummvm/commit/7904fff686da6a56b9674af36c833e58a8b403ce
Author: neuromancer (gustavo.grieco at gmail.com)
Date: 2023-03-20T09:00:04+01:00

Commit Message:
HYPNO: enable kSupportsReturnToLauncher

Changed paths:
    engines/hypno/hypno.h


diff --git a/engines/hypno/hypno.h b/engines/hypno/hypno.h
index 02f827eba92..eddbc7140d4 100644
--- a/engines/hypno/hypno.h
+++ b/engines/hypno/hypno.h
@@ -500,7 +500,7 @@ public:
 	}
 
 	bool hasFeature(EngineFeature f) const override {
-		return (f == kSupportsSavingDuringRuntime || f == kSupportsLoadingDuringRuntime);
+		return (f == kSupportsSavingDuringRuntime || f == kSupportsLoadingDuringRuntime || f == kSupportsReturnToLauncher);
 	}
 
 private:


Commit: 91d4d1802c8557853f5a4090b17af1d2bd691886
    https://github.com/scummvm/scummvm/commit/91d4d1802c8557853f5a4090b17af1d2bd691886
Author: neuromancer (gustavo.grieco at gmail.com)
Date: 2023-03-20T09:00:23+01:00

Commit Message:
HYPNO: show virtual keyboard when a player name should be introduced

Changed paths:
    engines/hypno/boyz/hard.cpp
    engines/hypno/wet/hard.cpp


diff --git a/engines/hypno/boyz/hard.cpp b/engines/hypno/boyz/hard.cpp
index b525e867b9b..80a1ef6bf5a 100644
--- a/engines/hypno/boyz/hard.cpp
+++ b/engines/hypno/boyz/hard.cpp
@@ -73,6 +73,7 @@ void BoyzEngine::runMainMenu(Code *code) {
 		if (posY >= 185)
 			break;
 	}
+	g_system->setFeatureState(OSystem::kFeatureVirtualKeyboard, true);
 	while (!shouldQuit() && cont) {
 		while (g_system->getEventManager()->pollEvent(event)) {
 			// Events
@@ -117,6 +118,7 @@ void BoyzEngine::runMainMenu(Code *code) {
 		drawScreen();
 		g_system->delayMillis(10);
 	}
+	g_system->setFeatureState(OSystem::kFeatureVirtualKeyboard, false);
 	menu->free();
 	delete menu;
 
diff --git a/engines/hypno/wet/hard.cpp b/engines/hypno/wet/hard.cpp
index 7b95a8ebe86..3e23fa87025 100644
--- a/engines/hypno/wet/hard.cpp
+++ b/engines/hypno/wet/hard.cpp
@@ -144,6 +144,7 @@ void WetEngine::runMainMenu(Code *code) {
 	drawImage(surName, subName.left, subName.top, true);
 	drawString("scifi08.fgx", _enterNameString, 48, 50, 100, c);
 	_name.clear();
+	g_system->setFeatureState(OSystem::kFeatureVirtualKeyboard, true);
 	bool cont = true;
 	while (!shouldQuit() && cont) {
 		while (g_system->getEventManager()->pollEvent(event)) {
@@ -209,6 +210,7 @@ void WetEngine::runMainMenu(Code *code) {
 	_name.toLowercase();
 	bool found = loadProfile(_name);
 
+	g_system->setFeatureState(OSystem::kFeatureVirtualKeyboard, false);
 	if (found || _name.empty()) {
 		menu->free();
 		delete menu;