[Scummvm-git-logs] scummvm master -> 8246de716a09ae12eeccea844d355ca5be92a30c

[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:
4638697f8f HYPNO: do not show ammo bar if the player is hit in wet
36aad1a1dc HYPNO: adjusted ammo bar position in c3x levels in wet
8246de716a HYPNO: redraw the cursor during arcade sequences after a target is hit


Commit: 4638697f8f6bc1a3aff090a0658091dccd9bbc8b
    https://github.com/scummvm/scummvm/commit/4638697f8f6bc1a3aff090a0658091dccd9bbc8b
Author: neuromancer (gustavo.grieco at gmail.com)
Date: 2022-04-17T16:54:02+02:00

Commit Message:
HYPNO: do not show ammo bar if the player is hit in wet

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


diff --git a/engines/hypno/wet/arcade.cpp b/engines/hypno/wet/arcade.cpp
index d4a326d0927..3eee8b6cebb 100644
--- a/engines/hypno/wet/arcade.cpp
+++ b/engines/hypno/wet/arcade.cpp
@@ -674,6 +674,9 @@ void WetEngine::drawAmmo() {
 	if (entry->ammoPos[0] == 0 && entry->ammoPos[1] == 0)
 		return;
 
+	if (_playerFrameIdx > _playerFrameSep) // Player was hit
+		return;
+
 	int d = (13 * (_maxAmmo - _ammo) / _maxAmmo);
 	if (d >= 13)
 		return;


Commit: 36aad1a1dc70e449fa7394a16f8caafdd59c4b58
    https://github.com/scummvm/scummvm/commit/36aad1a1dc70e449fa7394a16f8caafdd59c4b58
Author: neuromancer (gustavo.grieco at gmail.com)
Date: 2022-04-17T16:54:02+02:00

Commit Message:
HYPNO: adjusted ammo bar position in c3x levels in wet

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


diff --git a/engines/hypno/wet/wet.cpp b/engines/hypno/wet/wet.cpp
index 1b7235b4b0e..5c010daf0a9 100644
--- a/engines/hypno/wet/wet.cpp
+++ b/engines/hypno/wet/wet.cpp
@@ -34,9 +34,9 @@ static const chapterEntry rawChapterTable[] = {
 	{22, {70, 160}, {180, 160}, {220, 185}, {44, 162},  kHypnoColorGreen}, 	// c22
 	{23, {70, 160}, {180, 160}, {220, 185}, {44, 162},  kHypnoColorCyan}, 	// c23
 	{20, {128, 150}, {238, 150},{0,   0},   {0, 0},     kHypnoColorCyan}, 	// c20
-	{31, {70, 160}, {180, 160}, {220, 185}, {44, 162},  kHypnoColorGreen}, 	// c31
-	{32, {70, 160}, {180, 160}, {220, 185}, {44, 162},  kHypnoColorRed}, 	// c32
-	{33, {70, 160}, {180, 160}, {220, 185}, {44, 162},  kHypnoColorRed}, 	// c33
+	{31, {70, 160}, {180, 160}, {220, 185}, {44, 164},  kHypnoColorGreen}, 	// c31
+	{32, {70, 160}, {180, 160}, {220, 185}, {44, 164},  kHypnoColorRed}, 	// c32
+	{33, {70, 160}, {180, 160}, {220, 185}, {44, 164},  kHypnoColorRed}, 	// c33
 	{30, {19, 3},   {246, 3}, 	{246, 11},  {0, 0},     kHypnoColorRed}, 	// c30
 	{41, {70, 160}, {180, 160}, {220, 185}, {0, 0},     kHypnoColorRed}, 	// c41
 	{42, {70, 160}, {180, 160}, {220, 185}, {0, 0},     kHypnoColorRed}, 	// c42


Commit: 8246de716a09ae12eeccea844d355ca5be92a30c
    https://github.com/scummvm/scummvm/commit/8246de716a09ae12eeccea844d355ca5be92a30c
Author: neuromancer (gustavo.grieco at gmail.com)
Date: 2022-04-17T16:54:02+02:00

Commit Message:
HYPNO: redraw the cursor during arcade sequences after a target is hit

Changed paths:
    engines/hypno/arcade.cpp


diff --git a/engines/hypno/arcade.cpp b/engines/hypno/arcade.cpp
index a35101a4052..cfee71cb38e 100644
--- a/engines/hypno/arcade.cpp
+++ b/engines/hypno/arcade.cpp
@@ -625,6 +625,8 @@ void HypnoEngine::shoot(const Common::Point &mousePos, ArcadeShooting *arc) {
 		incEnemyHits();
 		if (_shoots[i].timesToShoot > 1) {
 			_shoots[i].timesToShoot = _shoots[i].timesToShoot - 1;
+			// Redraw cursor
+			drawCursorArcade(mousePos);
 			return;
 		}
 
@@ -695,6 +697,8 @@ void HypnoEngine::shoot(const Common::Point &mousePos, ArcadeShooting *arc) {
 			loadPalette((byte *) &p, _shoots[i].paletteOffset, _shoots[i].paletteSize);
 			_objKillsCount[_objIdx] = _objKillsCount[_objIdx] + _shoots[i].objKillsCount;
 		}
+		// Redraw cursor
+		drawCursorArcade(mousePos);
 	}
 }