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

[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:
d71c66a22d HYPNO: play hit sound in wet
a702f68653 HYPNO: added missing animation for arcade sequence in spider


Commit: d71c66a22dbc3e96ab3e4be1fc03e235e56a3f68
    https://github.com/scummvm/scummvm/commit/d71c66a22dbc3e96ab3e4be1fc03e235e56a3f68
Author: neuromancer (gustavo.grieco at gmail.com)
Date: 2022-03-20T20:56:31+01:00

Commit Message:
HYPNO: play hit sound in wet

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


diff --git a/engines/hypno/wet/arcade.cpp b/engines/hypno/wet/arcade.cpp
index ab88727f67c..277f124a728 100644
--- a/engines/hypno/wet/arcade.cpp
+++ b/engines/hypno/wet/arcade.cpp
@@ -408,6 +408,9 @@ void WetEngine::hitPlayer() {
 		if (_playerFrameIdx < _playerFrameSep)
 			_playerFrameIdx = _playerFrameSep;
 	}
+	if (!_hitSound.empty()) {
+		playSound(_soundPath + _hitSound, 1, 11025);
+	}
 }
 
 void WetEngine::drawShoot(const Common::Point &mousePos) {


Commit: a702f68653823c2505e51521bbe8944ea67ff2d1
    https://github.com/scummvm/scummvm/commit/a702f68653823c2505e51521bbe8944ea67ff2d1
Author: neuromancer (gustavo.grieco at gmail.com)
Date: 2022-03-20T20:56:31+01:00

Commit Message:
HYPNO: added missing animation for arcade sequence in spider

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


diff --git a/engines/hypno/spider/arcade.cpp b/engines/hypno/spider/arcade.cpp
index 34a716c273e..e50cd2456a4 100644
--- a/engines/hypno/spider/arcade.cpp
+++ b/engines/hypno/spider/arcade.cpp
@@ -198,9 +198,40 @@ void SpiderEngine::drawPlayer() {
 				break;
 			}
 			_lastPlayerPosition = _currentPlayerPosition;
-		} else if (_playerFrameIdx % 4 != 0 && _playerFrameIdx % 4 != 3) {
+		} else if (_playerFrameIdx < 48 && _playerFrameIdx % 4 != 0 && _playerFrameIdx % 4 != 3) {
 			_playerFrameIdx++;
 			_lastPlayerPosition = _currentPlayerPosition;
+		} else {
+			if (_arcadeMode == "YD") {
+				switch (_lastPlayerPosition) {
+				case kPlayerTop:
+					if ((_playerFrameIdx <= 11 && (_playerFrameIdx % 4 == 0 || _playerFrameIdx % 4 == 3)) || _playerFrameIdx >= 54)
+						_playerFrameIdx = 49;
+					else
+						_playerFrameIdx++;
+					break;
+
+				case kPlayerBottom:
+					if ((_playerFrameIdx <= 23  && (_playerFrameIdx % 4 == 0 || _playerFrameIdx % 4 == 3)) || _playerFrameIdx >= 65)
+						_playerFrameIdx = 60;
+					else
+						_playerFrameIdx++;
+					break;
+				case kPlayerLeft:
+					if ((_playerFrameIdx <= 35 && (_playerFrameIdx % 4 == 0 || _playerFrameIdx % 4 == 3)) || _playerFrameIdx >= 77)
+						_playerFrameIdx = 72;
+					else
+						_playerFrameIdx++;
+					break;
+
+				case kPlayerRight:
+					if ((_playerFrameIdx <= 47 && (_playerFrameIdx % 4 == 0 || _playerFrameIdx % 4 == 3)) || _playerFrameIdx >= 89)
+						_playerFrameIdx = 84;
+					else
+						_playerFrameIdx++;
+					break;
+				}
+			}
 		}
 	} else if (_arcadeMode == "YE" || _arcadeMode == "YF") {
 		Common::Point mousePos = g_system->getEventManager()->getMousePos();