[Scummvm-git-logs] scummvm master -> 3bde6ebf000a3630c3d3eed75121a2f23055c121

[AndywinXp]

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:
3bde6ebf00 SWORD1: PSX: Improve accuracy of "Paused" message


Commit: 3bde6ebf000a3630c3d3eed75121a2f23055c121
    https://github.com/scummvm/scummvm/commit/3bde6ebf000a3630c3d3eed75121a2f23055c121
Author: AndywinXp (andywinxp at gmail.com)
Date: 2023-10-17T00:26:46+02:00

Commit Message:
SWORD1: PSX: Improve accuracy of "Paused" message

Changed paths:
    engines/sword1/control.cpp
    engines/sword1/control.h
    engines/sword1/sword1.cpp
    engines/sword1/text.cpp


diff --git a/engines/sword1/control.cpp b/engines/sword1/control.cpp
index 795edf1d626..ba342126978 100644
--- a/engines/sword1/control.cpp
+++ b/engines/sword1/control.cpp
@@ -3112,6 +3112,21 @@ bool Control::loadCustomStrings(const char *filename) {
 }
 
 const uint8 *Control::getPauseString() {
+	if (SwordEngine::isPsx()) {
+		switch (SwordEngine::_systemVars.language) {
+		case BS1_ENGLISH:
+			return _psxPauseStrings[0];
+		case BS1_GERMAN:
+		case BS1_FRENCH:
+			return _psxPauseStrings[1];
+		case BS1_ITALIAN:
+		case BS1_SPANISH:
+			return _psxPauseStrings[2];
+		default:
+			return _psxPauseStrings[0];
+		}
+	}
+
 	return _lStrings[STR_PAUSED];
 }
 
diff --git a/engines/sword1/control.h b/engines/sword1/control.h
index 870d0f91679..4521c5466fb 100644
--- a/engines/sword1/control.h
+++ b/engines/sword1/control.h
@@ -216,6 +216,7 @@ private:
 	static const uint8 _mediaHouseLanguageStrings[20][43];
 	uint8 _customStrings[20][43];
 	const uint8(*_lStrings)[43];
+	const uint8 _psxPauseStrings[3][7] = { "Paused", "Pause", "Pausa" };
 	SwordEngine *_vm;
 	Common::SaveFileManager *_saveFileMan;
 	ObjectMan *_objMan;
diff --git a/engines/sword1/sword1.cpp b/engines/sword1/sword1.cpp
index 617a6cd5ca2..26347c5eff7 100644
--- a/engines/sword1/sword1.cpp
+++ b/engines/sword1/sword1.cpp
@@ -753,6 +753,11 @@ void SwordEngine::showDebugInfo() {
 	int32 pausedX = Logic::_scriptVars[SCROLL_OFFSET_X] + 400;
 	int32 pausedY = Logic::_scriptVars[SCROLL_OFFSET_Y] + 315;
 
+	if (SwordEngine::isPsx()) {
+		pausedX += 20;
+		pausedY -= 16;
+	}
+
 	uint8 buf[255];
 
 	if (_systemVars.gamePaused) {
diff --git a/engines/sword1/text.cpp b/engines/sword1/text.cpp
index fd578b8411f..46ecd0f66aa 100644
--- a/engines/sword1/text.cpp
+++ b/engines/sword1/text.cpp
@@ -294,9 +294,13 @@ void Text::printDebugLine(uint8 *ascii, uint8 first, int x, int y) {
 
 		x += _resMan->getUint16(head->width);
 
-		// The very first executable version didn't use any overlap (verified on UK disasm)
-		if (SwordEngine::_systemVars.realLanguage != Common::EN_ANY)
-			x -= DEBUG_OVERLAP;
+		if (SwordEngine::isPsx()) {
+			x -= OVERLAP;
+		} else {
+			// The very first executable version didn't use any overlap (verified on UK disasm)
+			if (SwordEngine::_systemVars.realLanguage != Common::EN_ANY)
+				x -= DEBUG_OVERLAP;
+		}
 
 		ascii++;
 	} while (*ascii);