[Scummvm-git-logs] scummvm master -> 602600b944d22ad551b90410c3c12e8d9e9d6fe3

[antoniou79]

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:
9d3658a35d DEVTOOLS: BLADERUNNER: Further optimizations to glyphs by IlDucci
ea086a8ac3 DEVTOOLS: BLADERUNNER: Switch to SUBTLS font for version sheet in MIX file
602600b944 BLADERUNNER: Removed crowded startup debug messages


Commit: 9d3658a35dae3038f80a0c0a0e28293fa495a3eb
    https://github.com/scummvm/scummvm/commit/9d3658a35dae3038f80a0c0a0e28293fa495a3eb
Author: Thanasis Antoniou (a.antoniou79 at gmail.com)
Date: 2020-02-07T03:24:52+02:00

Commit Message:
DEVTOOLS: BLADERUNNER: Further optimizations to glyphs by IlDucci

Credits to IlDucci from the Spanish translation team

Changed paths:
    devtools/create_bladerunner/subtitles/fontCreator/samples/overrideEncodingSUBLTS.txt
    devtools/create_bladerunner/subtitles/fontCreator/samples/subtitlesFontREVAMP.png
    devtools/create_bladerunner/subtitles/fontCreator/samples/subtitlesFontREVAMP.psd
    devtools/create_bladerunner/subtitles/sampleInput/overrideEncodingSUBLTS.txt
    devtools/create_bladerunner/subtitles/sampleInput/subtitlesFont.png


diff --git a/devtools/create_bladerunner/subtitles/fontCreator/samples/overrideEncodingSUBLTS.txt b/devtools/create_bladerunner/subtitles/fontCreator/samples/overrideEncodingSUBLTS.txt
index 3fd3bfe..66fb0ac 100644
--- a/devtools/create_bladerunner/subtitles/fontCreator/samples/overrideEncodingSUBLTS.txt
+++ b/devtools/create_bladerunner/subtitles/fontCreator/samples/overrideEncodingSUBLTS.txt
@@ -1,6 +1,6 @@
 targetEncoding=windows-1252
 asciiCharList=!!"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\]^_`abcdefghijklmnopqrstuvwxyz{|}~€‚ƒ„…†‡ˆ‰Š‹ŒŽ‘’“”•–—™š›œžŸ¡¢£¤¥¦§¨©ª«¬®¯°±²³´µ¶·¸¹º»¼½¾¿ÀÁÂÃÄÅÆÇÈÉÊËÌÍÎÏÐÑÒÓÔÕÖ×ØÙÚÛÜÝÞßà áâãäåæçèéêëìíîïðñòóôõö÷øùúûüýþ
-explicitKerningList=Î:1,Ï:1,ì:1,í:2,î:1,ï:1
-explicitWidthIncrement=1:2
+explicitKerningList=Ì:1,Í:2,Î:1,Ï:1,ì:1,í:2,î:1,ï:1
+explicitWidthIncrement=1:2,Ì:1,Í:1
 originalFontName=SUBLTS
 specialOutOfOrderGlyphsUTF8ToAsciiTargetEncoding=ÿ:€
diff --git a/devtools/create_bladerunner/subtitles/fontCreator/samples/subtitlesFontREVAMP.png b/devtools/create_bladerunner/subtitles/fontCreator/samples/subtitlesFontREVAMP.png
index 6cc4e64..4a503cd 100644
Binary files a/devtools/create_bladerunner/subtitles/fontCreator/samples/subtitlesFontREVAMP.png and b/devtools/create_bladerunner/subtitles/fontCreator/samples/subtitlesFontREVAMP.png differ
diff --git a/devtools/create_bladerunner/subtitles/fontCreator/samples/subtitlesFontREVAMP.psd b/devtools/create_bladerunner/subtitles/fontCreator/samples/subtitlesFontREVAMP.psd
index c8c462e..be9db98 100644
Binary files a/devtools/create_bladerunner/subtitles/fontCreator/samples/subtitlesFontREVAMP.psd and b/devtools/create_bladerunner/subtitles/fontCreator/samples/subtitlesFontREVAMP.psd differ
diff --git a/devtools/create_bladerunner/subtitles/sampleInput/overrideEncodingSUBLTS.txt b/devtools/create_bladerunner/subtitles/sampleInput/overrideEncodingSUBLTS.txt
index 3fd3bfe..66fb0ac 100644
--- a/devtools/create_bladerunner/subtitles/sampleInput/overrideEncodingSUBLTS.txt
+++ b/devtools/create_bladerunner/subtitles/sampleInput/overrideEncodingSUBLTS.txt
@@ -1,6 +1,6 @@
 targetEncoding=windows-1252
 asciiCharList=!!"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\]^_`abcdefghijklmnopqrstuvwxyz{|}~€‚ƒ„…†‡ˆ‰Š‹ŒŽ‘’“”•–—™š›œžŸ¡¢£¤¥¦§¨©ª«¬®¯°±²³´µ¶·¸¹º»¼½¾¿ÀÁÂÃÄÅÆÇÈÉÊËÌÍÎÏÐÑÒÓÔÕÖ×ØÙÚÛÜÝÞßà áâãäåæçèéêëìíîïðñòóôõö÷øùúûüýþ
-explicitKerningList=Î:1,Ï:1,ì:1,í:2,î:1,ï:1
-explicitWidthIncrement=1:2
+explicitKerningList=Ì:1,Í:2,Î:1,Ï:1,ì:1,í:2,î:1,ï:1
+explicitWidthIncrement=1:2,Ì:1,Í:1
 originalFontName=SUBLTS
 specialOutOfOrderGlyphsUTF8ToAsciiTargetEncoding=ÿ:€
diff --git a/devtools/create_bladerunner/subtitles/sampleInput/subtitlesFont.png b/devtools/create_bladerunner/subtitles/sampleInput/subtitlesFont.png
index 6cc4e64..4a503cd 100644
Binary files a/devtools/create_bladerunner/subtitles/sampleInput/subtitlesFont.png and b/devtools/create_bladerunner/subtitles/sampleInput/subtitlesFont.png differ


Commit: ea086a8ac346bdddf5dcaacd20181a2ba3627bd6
    https://github.com/scummvm/scummvm/commit/ea086a8ac346bdddf5dcaacd20181a2ba3627bd6
Author: Thanasis Antoniou (a.antoniou79 at gmail.com)
Date: 2020-02-07T03:24:53+02:00

Commit Message:
DEVTOOLS: BLADERUNNER: Switch to SUBTLS font for version sheet in MIX file

Changed paths:
    devtools/create_bladerunner/subtitles/mixResourceCreator/packBladeRunnerMIXFromPCTLKXLS04.py


diff --git a/devtools/create_bladerunner/subtitles/mixResourceCreator/packBladeRunnerMIXFromPCTLKXLS04.py b/devtools/create_bladerunner/subtitles/mixResourceCreator/packBladeRunnerMIXFromPCTLKXLS04.py
index 855a00f..bfc9d61 100644
--- a/devtools/create_bladerunner/subtitles/mixResourceCreator/packBladeRunnerMIXFromPCTLKXLS04.py
+++ b/devtools/create_bladerunner/subtitles/mixResourceCreator/packBladeRunnerMIXFromPCTLKXLS04.py
@@ -125,7 +125,7 @@ from struct import *
 from subtlsVersTextResource import *
 
 COMPANY_EMAIL = "classic.adventures.in.greek at gmail.com"
-APP_VERSION = "1.60"
+APP_VERSION = "1.70"
 APP_NAME = "packBladeRunnerMIXFromPCTLKXLS"
 APP_WRAPPER_NAME = "mixResourceCreator.py"
 APP_NAME_SPACED = "Blade Runner MIX Resource Creator"
@@ -170,7 +170,7 @@ SUPPORTED_TRANSLATION_SHEETS = [('OPTIONS.TR', 'KIA6PT'),
 								('CLUETYPE.TR', 'KIA6PT'),
 								('ENDCRED.TR', 'TAHOMA'),
 								('POGO.TR', 'KIA6PT'),
-								(SUPPORTED_DIALOGUE_VERSION_SHEET[:-1], 'KIA6PT')]
+								(SUPPORTED_DIALOGUE_VERSION_SHEET[:-1], SUBTITLES_FONT_NAME_CATEGORY)]
 # The FON files that are identically named to the originals are supposed to override them (needs ScummVM compatible functionality for that)
 # We don't deal with 10PT.FON since it's not used.
 # Also we don't deal with the SYSTEM (external OS font) that ERRORMSG.TRx uses!
@@ -668,7 +668,7 @@ def translateQuoteToAsciiProper(cellObj, pSheetName):
 
 		if(len(gListOfFontNamesToOutOfOrderGlyphs) > 0):
 			for (tmpFontName, tmpOOOList) in gListOfFontNamesToOutOfOrderGlyphs:
-				if tmpFontName ==  pertinentFontType:
+				if tmpFontName == pertinentFontType:
 					pertinentListOfOutOfOrderGlyphs = tmpOOOList
 					break
 


Commit: 602600b944d22ad551b90410c3c12e8d9e9d6fe3
    https://github.com/scummvm/scummvm/commit/602600b944d22ad551b90410c3c12e8d9e9d6fe3
Author: Thanasis Antoniou (a.antoniou79 at gmail.com)
Date: 2020-02-07T03:24:53+02:00

Commit Message:
BLADERUNNER: Removed crowded startup debug messages

Subtitles credits info is now only available from the "subtitle info" command in the debugger

This is due to an issue with certain localized characters not appearing correctly from debug() output on the background console (if enabled).

Changed paths:
    engines/bladerunner/bladerunner.cpp
    engines/bladerunner/debugger.cpp
    engines/bladerunner/subtitles.cpp


diff --git a/engines/bladerunner/bladerunner.cpp b/engines/bladerunner/bladerunner.cpp
index 12d7b42..85b9339 100644
--- a/engines/bladerunner/bladerunner.cpp
+++ b/engines/bladerunner/bladerunner.cpp
@@ -510,7 +510,7 @@ bool BladeRunnerEngine::startup(bool hasSavegames) {
 
 	_time = new Time(this);
 
-	debug("_framesPerSecondMax:: %s", _framesPerSecondMax? "true" : "false");
+//	debug("_framesPerSecondMax:: %s", _framesPerSecondMax? "true" : "false");
 	_framelimiter = new Framelimiter(this, _framesPerSecondMax? 120 : 60);
 
 	// Try to load the SUBTITLES.MIX first, before Startup.MIX
diff --git a/engines/bladerunner/debugger.cpp b/engines/bladerunner/debugger.cpp
index e922a7d..27ccb06 100644
--- a/engines/bladerunner/debugger.cpp
+++ b/engines/bladerunner/debugger.cpp
@@ -1291,7 +1291,7 @@ bool Debugger::cmdSubtitle(int argc, const char **argv) {
 
 		Common::String subtitleText = argv[1];
 		if (subtitleText == "info") {
-			debugPrintf("Subtitles version info: v%s (%s) %s by: %s\n",
+			debugPrintf("Subtitles version info: v%s (%s) %s\nCredits:\n%s\n",
 			            _vm->_subtitles->getSubtitlesInfo().versionStr.c_str(),
 			            _vm->_subtitles->getSubtitlesInfo().dateOfCompile.c_str(),
 			            _vm->_subtitles->getSubtitlesInfo().languageMode.c_str(),
diff --git a/engines/bladerunner/subtitles.cpp b/engines/bladerunner/subtitles.cpp
index a1f12f2..babf35e 100644
--- a/engines/bladerunner/subtitles.cpp
+++ b/engines/bladerunner/subtitles.cpp
@@ -142,11 +142,10 @@ void Subtitles::init(void) {
 			_subtitlesInfo.fontName = SUBTITLES_FONT_FILENAME_EXTERNAL;
 		}
 
-		debug("Subtitles version info: v%s (%s) %s by: %s",
+		debug("Subtitles version info: v%s (%s) %s",
 		       _subtitlesInfo.versionStr.c_str(),
 		       _subtitlesInfo.dateOfCompile.c_str(),
-		       _subtitlesInfo.languageMode.c_str(),
-		       _subtitlesInfo.credits.c_str());
+		       _subtitlesInfo.languageMode.c_str());
 
 	} else {
 		debug("Subtitles version info: N/A");