[Scummvm-git-logs] scummvm master -> 4cd06a5022db66b5b6e0106300b6b692798878d8

[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:
8722c25702 HYPNO: do not hit the player when attack frames are zero in boyz
c36379fe53 HYPNO: do not save profile if name is empty in boyz
4cd06a5022 HYPNO: update checkpoint after solving one puzzle in spider


Commit: 8722c25702e47e835fb377f47b1ea8def2767f00
    https://github.com/scummvm/scummvm/commit/8722c25702e47e835fb377f47b1ea8def2767f00
Author: neuromancer (gustavo.grieco at gmail.com)
Date: 2022-06-17T19:24:24+02:00

Commit Message:
HYPNO: do not hit the player when attack frames are zero in boyz

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


diff --git a/engines/hypno/boyz/arcade.cpp b/engines/hypno/boyz/arcade.cpp
index b20da3c3aa1..69af3c0f9ba 100644
--- a/engines/hypno/boyz/arcade.cpp
+++ b/engines/hypno/boyz/arcade.cpp
@@ -791,6 +791,10 @@ void BoyzEngine::missedTarget(Shoot *s, ArcadeShooting *arc) {
 		_background->decoder->forceSeekToFrame(missedAnimation);
 		_masks->decoder->forceSeekToFrame(missedAnimation);
 	}
+
+	if (s->attackFrames.size() > 0 && s->attackFrames.front() == 0)
+		return;
+
 	if (!s->nonHostile)
 		hitPlayer();
 }


Commit: c36379fe53247afd254e1b16bf956932b11f6ac4
    https://github.com/scummvm/scummvm/commit/c36379fe53247afd254e1b16bf956932b11f6ac4
Author: neuromancer (gustavo.grieco at gmail.com)
Date: 2022-06-17T19:24:24+02:00

Commit Message:
HYPNO: do not save profile if name is empty in boyz

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


diff --git a/engines/hypno/boyz/arcade.cpp b/engines/hypno/boyz/arcade.cpp
index 69af3c0f9ba..17b13feb07f 100644
--- a/engines/hypno/boyz/arcade.cpp
+++ b/engines/hypno/boyz/arcade.cpp
@@ -29,9 +29,10 @@ namespace Hypno {
 void BoyzEngine::runBeforeArcade(ArcadeShooting *arc) {
 	_checkpoint = _currentLevel;
 	_lastStats = _stats;
-	if (!_name.empty() && !_flashbackMode) {
-		// if name is empty or we are flashback mode,
+	if (!_flashbackMode) {
+		// if we are flashback mode,
 		// then we are testing some level
+		// and we should not save
 		saveProfile(_name, int(arc->id));
 	}
 
diff --git a/engines/hypno/boyz/boyz.cpp b/engines/hypno/boyz/boyz.cpp
index a67a15ab91a..8eb55ed077c 100644
--- a/engines/hypno/boyz/boyz.cpp
+++ b/engines/hypno/boyz/boyz.cpp
@@ -980,6 +980,11 @@ void BoyzEngine::drawString(const Common::String &font, const Common::String &st
 }
 
 void BoyzEngine::saveProfile(const Common::String &name, int levelId) {
+	if (name.empty()) {
+		debugC(1, kHypnoDebugMedia, "WARNING: refusing to save at last level %d with an empty name", _lastLevel);
+		return;
+	}
+
 	SaveStateList saves = getMetaEngine()->listSaves(_targetName.c_str());
 
 	// Find the correct level index to before saving


Commit: 4cd06a5022db66b5b6e0106300b6b692798878d8
    https://github.com/scummvm/scummvm/commit/4cd06a5022db66b5b6e0106300b6b692798878d8
Author: neuromancer (gustavo.grieco at gmail.com)
Date: 2022-06-17T19:24:24+02:00

Commit Message:
HYPNO: update checkpoint after solving one puzzle in spider

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


diff --git a/engines/hypno/spider/hard.cpp b/engines/hypno/spider/hard.cpp
index 2136b41a10b..6ccec657753 100644
--- a/engines/hypno/spider/hard.cpp
+++ b/engines/hypno/spider/hard.cpp
@@ -1117,6 +1117,7 @@ void SpiderEngine::runFuseBox(Code *code) {
 
 		if (hfound && vfound) {
 			_nextLevel = code->levelIfWin;
+			_checkpoint = _nextLevel;
 			return;
 		}