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

dreammaster dreammaster at scummvm.org
Sun Jun 18 00:29:40 CEST 2017


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:
2cdb81482c DEVTOOLS: Add extra German EXE resources to create_titanic
3d932e4b89 TITANIC: Change of resource names from titanic.dat


Commit: 2cdb81482c50f40913f9f4751798c5ef1e0cee6a
    https://github.com/scummvm/scummvm/commit/2cdb81482c50f40913f9f4751798c5ef1e0cee6a
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2017-06-17T18:27:24-04:00

Commit Message:
DEVTOOLS: Add extra German EXE resources to create_titanic

Changed paths:
    devtools/create_titanic/create_titanic_dat.cpp


diff --git a/devtools/create_titanic/create_titanic_dat.cpp b/devtools/create_titanic/create_titanic_dat.cpp
index 32699e4..86fa4f1 100644
--- a/devtools/create_titanic/create_titanic_dat.cpp
+++ b/devtools/create_titanic/create_titanic_dat.cpp
@@ -55,7 +55,7 @@
  */
 
 #define VERSION_NUMBER 1
-#define HEADER_SIZE 0x1000
+#define HEADER_SIZE 0x1100
 
 Common::File inputFile, outputFile;
 Common::PEResources resEng, resGer;
@@ -1097,25 +1097,34 @@ void writeResource(const char *name, Common::File *file) {
 	delete file;
 }
 
+void writeResource(const char *resName, const char *sectionStr, uint32 resId, bool isEnglish = true) {
+	Common::PEResources &res = isEnglish ? resEng : resGer;
+	Common::File *file = res.getResource(getResId(sectionStr), resId);
+	assert(file);
+	writeResource(resName, file);
+}
+
 void writeResource(const char *sectionStr, uint32 resId, bool isEnglish = true) {
 	char nameBuffer[256];
 	sprintf(nameBuffer, "%s/%u", sectionStr, resId);
+	writeResource(nameBuffer, sectionStr, resId, isEnglish);
+}
 
+void writeResource(const char *resName, const char *sectionStr, const char *resId, bool isEnglish = true) {
 	Common::PEResources &res = isEnglish ? resEng : resGer;
-	Common::File *file = res.getResource(getResId(sectionStr), resId);
+	Common::File *file = res.getResource(getResId(sectionStr),
+		Common::WinResourceID(resId));
 	assert(file);
-	writeResource(nameBuffer, file);
+	writeResource(resName, file);
 }
 
 void writeResource(const char *sectionStr, const char *resId, bool isEnglish = true) {
 	char nameBuffer[256];
 	sprintf(nameBuffer, "%s/%s", sectionStr, resId);
+	if (!isEnglish)
+		strcat(nameBuffer, "/DE");
 
-	Common::PEResources &res = isEnglish ? resEng : resGer;
-	Common::File *file = res.getResource(getResId(sectionStr),
-		Common::WinResourceID(resId));
-	assert(file);
-	writeResource(nameBuffer, file);
+	writeResource(nameBuffer, sectionStr, resId, isEnglish);
 }
 
 void writeBitmap(const char *name, Common::File *file) {
@@ -1489,14 +1498,19 @@ void writeData() {
 	writeResource("STFONT", 152);
 	writeResource("STFONT", 153);
 
+	writeResource("TEXT/STVOCAB", "TEXT", "STVOCAB.TXT");
+	writeResource("TEXT/JRQUOTES", "TEXT", "JRQUOTES.TXT");
+	writeResource("TEXT", 155);
+	if (!resGer.empty()) {
+		writeResource("TEXT/STVOCAB/DE", "TEXT", "STVOCABDE.TXT", false);
+		writeResource("TEXT/JRQUOTES/DE", "TEXT", "JRQUOTESDE.TXT", false);
+		writeResource("TEXT/155/DE", "TEXT", 155, false);
+	}
+
 	writeResource("STARFIELD", 132);
 	writeStarfieldPoints();
 	writeStarfieldPoints2();
 
-	writeResource("TEXT", "STVOCAB.TXT");
-	writeResource("TEXT", "JRQUOTES.TXT");
-	writeResource("TEXT", 155);
-
 	writeStringArray("TEXT/ITEM_DESCRIPTIONS", ITEM_DESCRIPTIONS, 46);
 	writeStringArray("TEXT/ITEM_DESCRIPTIONS/DE", ITEM_DESCRIPTIONS_DE, 46);
 	writeStringArray("TEXT/ITEM_NAMES", ITEM_NAMES, 46);


Commit: 3d932e4b89c8e49e56a49eb63310c3ad046d3eee
    https://github.com/scummvm/scummvm/commit/3d932e4b89c8e49e56a49eb63310c3ad046d3eee
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2017-06-17T18:29:24-04:00

Commit Message:
TITANIC: Change of resource names from titanic.dat

Changed paths:
    engines/titanic/true_talk/tt_quotes.cpp
    engines/titanic/true_talk/tt_vocab.cpp


diff --git a/engines/titanic/true_talk/tt_quotes.cpp b/engines/titanic/true_talk/tt_quotes.cpp
index c690ac8..c1a1e16 100644
--- a/engines/titanic/true_talk/tt_quotes.cpp
+++ b/engines/titanic/true_talk/tt_quotes.cpp
@@ -36,7 +36,7 @@ TTquotes::~TTquotes() {
 }
 
 void TTquotes::load() {
-	Common::SeekableReadStream *r = g_vm->_filesManager->getResource("TEXT/JRQUOTES.TXT");
+	Common::SeekableReadStream *r = g_vm->_filesManager->getResource("TEXT/JRQUOTES");
 	size_t size = r->readUint32LE();
 	_loaded = true;
 
diff --git a/engines/titanic/true_talk/tt_vocab.cpp b/engines/titanic/true_talk/tt_vocab.cpp
index b37d30e..dcd6a22 100644
--- a/engines/titanic/true_talk/tt_vocab.cpp
+++ b/engines/titanic/true_talk/tt_vocab.cpp
@@ -34,7 +34,7 @@ namespace Titanic {
 
 TTvocab::TTvocab(int val): _headP(nullptr), _tailP(nullptr),
 		_word(nullptr), _vocabMode(val) {
-	load("STVOCAB.TXT");
+	load("STVOCAB");
 }
 
 TTvocab::~TTvocab() {





More information about the Scummvm-git-logs mailing list