[Scummvm-git-logs] scummvm master -> 87677b417496ceadcab6689b5145213606de9564

[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:
a1268779e6 HYPNO: render fonts correctly for wet early demo
87677b4174 HYPNO: more fixes for the early wet demo


Commit: a1268779e6fd74e6574f3e65b74cca55673f26fa
    https://github.com/scummvm/scummvm/commit/a1268779e6fd74e6574f3e65b74cca55673f26fa
Author: neuromancer (gustavo.grieco at gmail.com)
Date: 2024-07-25T21:01:22+02:00

Commit Message:
HYPNO: render fonts correctly for wet early demo

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


diff --git a/engines/hypno/wet/wet.cpp b/engines/hypno/wet/wet.cpp
index ba87ef6c8b0..c78b50cecba 100644
--- a/engines/hypno/wet/wet.cpp
+++ b/engines/hypno/wet/wet.cpp
@@ -60,8 +60,8 @@ static const chapterEntry rawChapterTable[] = {
 };
 
 static const chapterEntry rawChapterTableEarlyDemo[] = {
-	{31, {49, 12}, {205, 12}, {0,   0},   {127, 172}, 0,   kHypnoColorRed}, 	 // c31
-	{41, {49, 12}, {205, 12}, {0,   0},   {127, 172}, 0,   kHypnoColorRed}, 	 // c41
+	{31, {48, 15}, {205, 15}, {0,   0},   {0, 0}, 0,   kHypnoColorRed}, 	 // c31
+	{41, {48, 15}, {205, 15}, {0,   0},   {0, 0}, 0,   kHypnoColorRed}, 	 // c41
 	{0,  {0,  0},   {0,   0},   {0,   0},   {0, 0},     0, kHypnoColorRed}    	// NULL
 };
 
@@ -731,7 +731,7 @@ void WetEngine::drawString(const Common::String &font, const Common::String &str
 			else if (chr == '.')
 				offset = 4;
 
-			drawGlyph(_font05, curx + 1, offset + y, 275 + 40*chr, 5, 5, 8, color, false);
+			drawGlyph(_font05, curx + 1, offset + y, 275 + 40*chr, 5, 5, 8, color, _variant == "EarlyDemo");
 			curx += 6;
 		}
 	} else if (font == "scifi08.fgx") {
@@ -753,7 +753,7 @@ void WetEngine::drawString(const Common::String &font, const Common::String &str
 			else if (Common::isLower(chr) || chr == ':')
 				offset = 2;
 
-			drawGlyph(_font08, curx + 1, offset + y, 1554 + 72*(chr-32), 6, 8, 8, color, false);
+			drawGlyph(_font08, curx + 1, offset + y, 1554 + 72*(chr-32), 6, 8, 8, color, _variant == "EarlyDemo");
 			curx += 7;
 		}
 	} else


Commit: 87677b417496ceadcab6689b5145213606de9564
    https://github.com/scummvm/scummvm/commit/87677b417496ceadcab6689b5145213606de9564
Author: neuromancer (gustavo.grieco at gmail.com)
Date: 2024-07-25T21:01:22+02:00

Commit Message:
HYPNO: more fixes for the early wet demo

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


diff --git a/engines/hypno/arcade.cpp b/engines/hypno/arcade.cpp
index 0089b71cd62..cbd025040fd 100644
--- a/engines/hypno/arcade.cpp
+++ b/engines/hypno/arcade.cpp
@@ -234,6 +234,9 @@ void HypnoEngine::runArcade(ArcadeShooting *arc) {
 	anchor.x = 0;	// This is almost always zero, except when the screen starts at the middle
 					// We don't really need it
 	anchor.y = MAX(0, anchor.y - arc->mouseBox.bottom);
+
+	// Correct mouseBox
+	arc->mouseBox.moveTo(anchor.x, anchor.y);
 	_background = new MVideo(arc->backgroundVideo, anchor, false, false, false);
 
 	drawCursorArcade(mousePos);
@@ -323,6 +326,8 @@ void HypnoEngine::runArcade(ArcadeShooting *arc) {
 				drawCursorArcade(mousePos);
 				if (mousePos.x >= arc->mouseBox.right-1) {
 					g_system->warpMouse(arc->mouseBox.right-1, mousePos.y);
+				} else if (mousePos.y < arc->mouseBox.top) { // Usually top is zero
+					g_system->warpMouse(mousePos.x, arc->mouseBox.top + 1);
 				} else if (mousePos.y >= arc->mouseBox.bottom-1) {
 					g_system->warpMouse(mousePos.x, arc->mouseBox.bottom-1);
 				} else if (mousePos.x <= 40 && offset.x < 0) {
diff --git a/engines/hypno/wet/hard.cpp b/engines/hypno/wet/hard.cpp
index 1e9a77527e6..bf663c04f4f 100644
--- a/engines/hypno/wet/hard.cpp
+++ b/engines/hypno/wet/hard.cpp
@@ -342,7 +342,7 @@ Common::String WetEngine::getLocalizedString(const Common::String name) {
 		case Common::ES_ESP:
 			return "ENERGIA";
 		default:
-			return "HEALTH";
+			return "ENERGY";
 		}
 	} else if (name == "objectives") {
 		switch (_language) {