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

[neuromancer]

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

Summary:
fd40404b60 HYPNO: restore damage in certain arcade sequences


Commit: fd40404b60102e32a0ea2f938d0ee956cf6b3a5a
    https://github.com/scummvm/scummvm/commit/fd40404b60102e32a0ea2f938d0ee956cf6b3a5a
Author: neuromancer (gustavo.grieco at gmail.com)
Date: 2022-02-23T20:44:36+01:00

Commit Message:
HYPNO: restore damage in certain arcade sequences

Changed paths:
    engines/hypno/arcade.cpp


diff --git a/engines/hypno/arcade.cpp b/engines/hypno/arcade.cpp
index 3e6f9b3acd0..70d364b9d4a 100644
--- a/engines/hypno/arcade.cpp
+++ b/engines/hypno/arcade.cpp
@@ -411,7 +411,7 @@ void HypnoEngine::runArcade(ArcadeShooting *arc) {
 							playVideo(*s.video);
 							s.video->currentFrame = s.video->decoder->decodeNextFrame(); // Skip the first frame
 							if (s.attackFrames.size() == 0) {
-								uint32 lastFrame = s.explosionFrames.back().lastFrame(); 
+								uint32 lastFrame = s.bodyFrames.back().lastFrame();
 								s.attackFrames.push_back(lastFrame - 3);
 							}
 							s.lastFrame = s.bodyFrames[s.bodyFrames.size() - 1].lastFrame();
@@ -432,7 +432,7 @@ void HypnoEngine::runArcade(ArcadeShooting *arc) {
 				int frame = it->video->decoder->getCurFrame();
 				if (it->attackFrames.size() > 0) {
 					uint32 attackFrame = it->attackFrames.front();
-					if (frame > 0 && frame >= (int)(attackFrame - 1) && !it->destroyed) {
+					if (frame > 0 && frame >= (int)(attackFrame - 2) && !it->destroyed) {
 						_health = _health - it->attackWeight;
 						hitPlayer();
 						it->attackFrames.pop_front();