[Scummvm-git-logs] scummvm-tools master -> 160b86b905056aa8a84d2ecebc12386ffd21299a

[sev-]

This automated email contains information about 3 new commits which have been
pushed to the 'scummvm-tools' repo located at https://github.com/scummvm/scummvm-tools .

Summary:
8e83de420f TOOLS: PRINCE: Add special treatment for O_SETSTRING parameter
6689fa16fd TOOLS: PRINCE: Fix dialog matching in POT generation
160b86b905 TOOLS: PRINCE: Print out extra strings in talktxt


Commit: 8e83de420feab436460697898215543a17c1e0bb
    https://github.com/scummvm/scummvm-tools/commit/8e83de420feab436460697898215543a17c1e0bb
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2018-05-04T08:11:15+02:00

Commit Message:
TOOLS: PRINCE: Add special treatment for O_SETSTRING parameter

Changed paths:
    engines/prince/deprince.cpp


diff --git a/engines/prince/deprince.cpp b/engines/prince/deprince.cpp
index ecac57b..a39a6f1 100644
--- a/engines/prince/deprince.cpp
+++ b/engines/prince/deprince.cpp
@@ -83,7 +83,7 @@ struct OpCodes {
 	{ "O_ADDFLAG", "df", false },
 	{ "O_TALKANIM", "ff", false },
 	{ "O_SUBFLAG", "df", false },
-	{ "O_SETSTRING", "i", false },
+	{ "O_SETSTRING", "v", false },
 	{ "O_ANDFLAG", "df", false },		// 40
 	{ "O_GETMOBDATA", "dff", false },
 	{ "O_ORFLAG", "df", false },
@@ -371,11 +371,15 @@ int decompile(const char *sname, int pos, bool printOut = false) {
 				if (printOut)
 					printf("%d", v);
 				break;
-			case 'i':
+			case 'v':
 				v = READ_LE_UINT32(&data[pos]); ADVANCES4();
 
-				if (printOut)
-					printf("%d", v);
+				if (printOut) {
+					if (v > 80000)
+						printf("variatxt[%d]", v - 80000);
+					else
+						printf("%d", v);
+				}
 				break;
 			case 'd':
 				v = READ_LE_UINT16(&data[pos]); ADVANCES2();


Commit: 6689fa16fda1dd6e632623a580f936c55e3bcda7
    https://github.com/scummvm/scummvm-tools/commit/6689fa16fda1dd6e632623a580f936c55e3bcda7
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2018-05-05T22:44:51+02:00

Commit Message:
TOOLS: PRINCE: Fix dialog matching in POT generation

Changed paths:
    engines/prince/gen-po.pl


diff --git a/engines/prince/gen-po.pl b/engines/prince/gen-po.pl
index 00a713c..ee0c68f 100644
--- a/engines/prince/gen-po.pl
+++ b/engines/prince/gen-po.pl
@@ -55,7 +55,7 @@ process_inv $lang, "invtxt.txt.out";
 process_mob $lang, "mob.txt.out";
 process_varia $lang, "variatxt.txt.out";
 
-process_talk_ids 'pl', "talktxt_ids.txt";
+process_talk_ids 'pl', "$poldir/talktxt_ids.txt";
 process_credits 'pl', "$poldir/credits.txt.out";
 process_talk 'pl', "$poldir/talktxt.txt.out";
 process_inv 'pl', "$poldir/invtxt.txt.out";
@@ -227,7 +227,7 @@ sub process_talk($$) {
 
 		next if $_ eq 'talktxt.dat';
 
-		my $d = sprintf("%03d", $data_ids{$lang}[$dialog]);
+		my $d = sprintf("%04d", ($data_ids{$lang}[$dialog] || 1000 + $dialog));
 
 		if ($_ eq "\@DIALOGBOX_LINES:") {
 			process_talkWithDialog($lang, $d, IN);
@@ -403,8 +403,8 @@ sub process_talk_ids($$) {
 
 		next if $_ eq 'talktxt_ids';
 
-		$data_ids{$lang}[$n] = $_;
-		#$data_ids{$lang}[$_] = $n if $_ > 0;
+		#$data_ids{$lang}[$n] = $_;
+		$data_ids{$lang}[$_] = $n if $_ > 0;
 
 		$n++;
 	}


Commit: 160b86b905056aa8a84d2ecebc12386ffd21299a
    https://github.com/scummvm/scummvm-tools/commit/160b86b905056aa8a84d2ecebc12386ffd21299a
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2018-05-05T23:04:40+02:00

Commit Message:
TOOLS: PRINCE: Print out extra strings in talktxt

Changed paths:
    engines/prince/gen-po.pl


diff --git a/engines/prince/gen-po.pl b/engines/prince/gen-po.pl
index ee0c68f..f6005dd 100644
--- a/engines/prince/gen-po.pl
+++ b/engines/prince/gen-po.pl
@@ -104,6 +104,26 @@ for my $f (sort keys $data{$lang}) {
 		if (exists $data{$lang}{$f}{$n}) {
 			warn "$lang:$f:$n extra";
 
+			if (index($data{$lang}{$f}{$n}, "\\n") != -1) {  # Multiline
+				chomp $data{$lang}{$f}{$n};
+
+				print <<EOF;
+
+#: $f:$n
+msgid ""
+"extra$extra_tr"
+msgstr ""
+$data{$lang}{$f}{$n}
+EOF
+			} else {
+				print <<EOF;
+
+#: $f:$n
+msgid "extra$extra_tr"
+msgstr "$data{$lang}{$f}{$n}"
+EOF
+			}
+
 			$extra_tr++;
 		}
 	}