[Scummvm-git-logs] scummvm master -> f8fe43bfc2b937a4dd2161c046a74c2e69082468

[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:
5f8f201c44 HYPNO: show player name during all the main menu of wet
bb72a8332c HYPNO: avoid saving if user decides to quit during main menu of wet
f8fe43bfc2 HYPNO: cheat key remapped to 's' in wet


Commit: 5f8f201c44f2e3ed375e39fb6afc3fe528bec68d
    https://github.com/scummvm/scummvm/commit/5f8f201c44f2e3ed375e39fb6afc3fe528bec68d
Author: neuromancer (gustavo.grieco at gmail.com)
Date: 2022-06-04T10:44:34+02:00

Commit Message:
HYPNO: show player name during all the main menu of wet

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


diff --git a/engines/hypno/wet/hard.cpp b/engines/hypno/wet/hard.cpp
index 363dbf5e71b..4a37e68f8a1 100644
--- a/engines/hypno/wet/hard.cpp
+++ b/engines/hypno/wet/hard.cpp
@@ -211,6 +211,7 @@ void WetEngine::runMainMenu(Code *code) {
 
 
 	saveProfile(_name, _ids[_lastLevel]);
+	_name.toUppercase();  // We do this in order to show it again
 
 	Common::Rect subDifficulty(20, 104, 233, 119);
 	Graphics::Surface surDifficulty = overlay->getSubArea(subDifficulty);
@@ -234,6 +235,9 @@ void WetEngine::runMainMenu(Code *code) {
 	difficulties.push_back("2");
 	uint32 idx = 1;
 
+	drawString("scifi08.fgx", _enterNameString, 48, 50, 100, c);
+	drawString("scifi08.fgx", _name, 140, 50, 170, c);
+
 	cont = true;
 	while (!shouldQuit() && cont) {
 		while (g_system->getEventManager()->pollEvent(event)) {
@@ -266,6 +270,9 @@ void WetEngine::runMainMenu(Code *code) {
 				else
 					error("Invalid difficulty: %s", difficulties[idx].c_str());
 
+				drawString("scifi08.fgx", _enterNameString, 48, 50, 100, c);
+				drawString("scifi08.fgx", _name, 140, 50, 170, c);
+
 				break;
 			default:
 				break;
@@ -274,7 +281,7 @@ void WetEngine::runMainMenu(Code *code) {
 		drawScreen();
 		g_system->delayMillis(10);
 	}
-
+	_name.toLowercase(); // make sure it is lowercase when we finish
 	_difficulty = difficulties[idx];
 	_nextLevel = code->levelIfWin;
 	menu->free();


Commit: bb72a8332cec7fc84dd828e164653f1cdbc361df
    https://github.com/scummvm/scummvm/commit/bb72a8332cec7fc84dd828e164653f1cdbc361df
Author: neuromancer (gustavo.grieco at gmail.com)
Date: 2022-06-04T11:17:45+02:00

Commit Message:
HYPNO: avoid saving if user decides to quit during main menu of wet

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


diff --git a/engines/hypno/wet/hard.cpp b/engines/hypno/wet/hard.cpp
index 4a37e68f8a1..6a4c426f072 100644
--- a/engines/hypno/wet/hard.cpp
+++ b/engines/hypno/wet/hard.cpp
@@ -201,7 +201,7 @@ void WetEngine::runMainMenu(Code *code) {
 	_name.toLowercase();
 	bool found = loadProfile(_name);
 
-	if (found) {
+	if (found || _name.empty()) {
 		menu->free();
 		delete menu;
 		overlay->free();


Commit: f8fe43bfc2b937a4dd2161c046a74c2e69082468
    https://github.com/scummvm/scummvm/commit/f8fe43bfc2b937a4dd2161c046a74c2e69082468
Author: neuromancer (gustavo.grieco at gmail.com)
Date: 2022-06-04T11:30:42+02:00

Commit Message:
HYPNO: cheat key remapped to 's' in wet

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


diff --git a/engines/hypno/wet/arcade.cpp b/engines/hypno/wet/arcade.cpp
index 2ef8375c0d4..62b3c601c72 100644
--- a/engines/hypno/wet/arcade.cpp
+++ b/engines/hypno/wet/arcade.cpp
@@ -670,10 +670,6 @@ void WetEngine::runBeforeArcade(ArcadeShooting *arc) {
 
 void WetEngine::pressedKey(const int keycode) {
 	if (keycode == Common::KEYCODE_c) {
-		if (_cheatsEnabled) {
-			_skipLevel = true;
-			return;
-		}
 		_background->decoder->pauseVideo(true);
 		showCredits();
 		loadPalette(_currentPalette);
@@ -681,6 +677,10 @@ void WetEngine::pressedKey(const int keycode) {
 		_background->decoder->pauseVideo(false);
 		updateScreen(*_background);
 		drawScreen();
+	} else if (keycode == Common::KEYCODE_s) { // Added for testing
+		if (_cheatsEnabled) {
+			_skipLevel = true;
+		}
 	} else if (keycode == Common::KEYCODE_k) { // Added for testing
 		_health = 0;
 	} else if (keycode == Common::KEYCODE_ESCAPE) {