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

[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:
9a2e1896a3 HYPNO: clear name and only use letters on it in wet
da592143a4 HYPNO: make sure checkpoint is saved before a fight but not always after in spider


Commit: 9a2e1896a318e48931a0eb8c414fbffb8d8c66f0
    https://github.com/scummvm/scummvm/commit/9a2e1896a318e48931a0eb8c414fbffb8d8c66f0
Author: neuromancer (gustavo.grieco at gmail.com)
Date: 2022-04-02T09:41:03+02:00

Commit Message:
HYPNO: clear name and only use letters on it in wet

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


diff --git a/engines/hypno/wet/hard.cpp b/engines/hypno/wet/hard.cpp
index 0e1bd754526..04a433217dc 100644
--- a/engines/hypno/wet/hard.cpp
+++ b/engines/hypno/wet/hard.cpp
@@ -134,6 +134,7 @@ void WetEngine::runMainMenu(Code *code) {
 	Graphics::Surface surName = overlay->getSubArea(subName);
 	drawImage(surName, subName.left, subName.top, false);
 	drawString("scifi08.fgx", "ENTER NAME :", 48, 50, 100, c);
+	_name.clear();
 	bool cont = true;
 	while (!shouldQuit() && cont) {
 		while (g_system->getEventManager()->pollEvent(event)) {
@@ -150,7 +151,7 @@ void WetEngine::runMainMenu(Code *code) {
 				else if (event.kbd.keycode == Common::KEYCODE_RETURN && !_name.empty()) {
 					cont = false;
 				}
-				else if (Common::isAlnum(event.kbd.keycode)) {
+				else if (Common::isAlpha(event.kbd.keycode)) {
 					playSound("sound/m_choice.raw", 1);
 					_name = _name + char(event.kbd.keycode - 32);
 				}


Commit: da592143a4ec2f8cf705efa37ef957db67799049
    https://github.com/scummvm/scummvm/commit/da592143a4ec2f8cf705efa37ef957db67799049
Author: neuromancer (gustavo.grieco at gmail.com)
Date: 2022-04-02T09:41:03+02:00

Commit Message:
HYPNO: make sure checkpoint is saved before a fight but not always after in spider

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


diff --git a/engines/hypno/spider/arcade.cpp b/engines/hypno/spider/arcade.cpp
index e50cd2456a4..eb3cc0e3393 100644
--- a/engines/hypno/spider/arcade.cpp
+++ b/engines/hypno/spider/arcade.cpp
@@ -34,6 +34,7 @@ static const int shootOriginIndex[9][2] = {
 	{41, 3}, {51, 3}, {65, 6}, {40, 16}, {58, 20}, {67, 10}, {37, 14}, {37, 15}, {67, 22}};
 
 void SpiderEngine::runBeforeArcade(ArcadeShooting *arc) {
+	_checkpoint = _currentLevel;
 	assert(!arc->player.empty());
 	_playerFrames = decodeFrames(arc->player);
 	_playerFrameSep = 0;
@@ -58,8 +59,6 @@ void SpiderEngine::runBeforeArcade(ArcadeShooting *arc) {
 }
 
 void SpiderEngine::runAfterArcade(ArcadeShooting *arc) {
-	_checkpoint = _nextLevel;
-
 	if (_health <= 0) {
 		assert(_score >= _bonus);
 		_score -= _bonus;