[Scummvm-git-logs] scummvm master -> 327dcf98ec7ec520bba5319087affa693d91c87d

sev- sev at scummvm.org
Tue Nov 14 04:09:41 CET 2017


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:
327dcf98ec DRASCULA: Make remaining static texts translatable


Commit: 327dcf98ec7ec520bba5319087affa693d91c87d
    https://github.com/scummvm/scummvm/commit/327dcf98ec7ec520bba5319087affa693d91c87d
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2017-11-14T04:07:11+01:00

Commit Message:
DRASCULA: Make remaining static texts translatable

drascula.dat file version bumped

Changed paths:
    devtools/create_drascula/create_drascula.cpp
    devtools/create_drascula/create_drascula.h
    devtools/create_drascula/staticdata.h
    dists/engine-data/drascula.dat
    engines/drascula/animation.cpp
    engines/drascula/drascula.h
    engines/drascula/objects.cpp
    engines/drascula/rooms.cpp
    engines/drascula/talk.cpp


diff --git a/devtools/create_drascula/create_drascula.cpp b/devtools/create_drascula/create_drascula.cpp
index 2ed7e4f..4afec21 100644
--- a/devtools/create_drascula/create_drascula.cpp
+++ b/devtools/create_drascula/create_drascula.cpp
@@ -35,7 +35,7 @@
 #include "create_drascula.h"
 #include "staticdata.h"
 
-#define DRASCULA_DAT_VER 4	// 1 byte
+#define DRASCULA_DAT_VER 5	// 1 byte
 
 static void writeByte(FILE *fp, uint8 b) {
 	fwrite(&b, 1, 1, fp);
diff --git a/devtools/create_drascula/create_drascula.h b/devtools/create_drascula/create_drascula.h
index 82abdce..6248245 100644
--- a/devtools/create_drascula/create_drascula.h
+++ b/devtools/create_drascula/create_drascula.h
@@ -41,7 +41,7 @@
 #define NUM_TEXTSYS 4
 #define NUM_TEXTHIS 5
 #define NUM_TEXTVERBS 6
-#define NUM_TEXTMISC 3
+#define NUM_TEXTMISC 7
 #define NUM_TEXTD1 11
 
 typedef unsigned char   uint8;
diff --git a/devtools/create_drascula/staticdata.h b/devtools/create_drascula/staticdata.h
index 7cafe58..2efca35 100644
--- a/devtools/create_drascula/staticdata.h
+++ b/devtools/create_drascula/staticdata.h
@@ -6194,26 +6194,46 @@ const char *_textmisc[NUM_LANGS][NUM_TEXTMISC] = {
 	"HUNCHBACKED",
 	"Transilvania, 1993 d.c.",
 	"GOOOOOOOAAAAAAAL!",
+	"hacker",
+	"yoda",
+	"igor",
+	"groaaarrrrgghhhh!",
 },
 {
 	"jorobado",
 	"Transilvania, 1993 d.c. (despues de cenar)",
 	"GOOOOOOOOOOOOOOOL",
+	"hacker",
+	"yoda",
+	"igor",
+	"groaaarrrrgghhhh!",
 },
 {
 	"HUNCHBACKED",
 	"Transilvania, 1993 d.c.",
 	"GOOOOOOOAAAAAAAL!",
+	"hacker",
+	"yoda",
+	"igor",
+	"groaaarrrrgghhhh!",
 },
 {
 	"BOSSU",
 	"Transilvania, 1993 d.c.",
 	"GOOOOOOOAAAAAAAL!",
+	"hacker",
+	"yoda",
+	"igor",
+	"groaaarrrrgghhhh!",
 },
 {
 	"GOBBO",
 	"Transilvania, 1993 d.c. (dopo cena)",
 	"GOOOOOOOOOOOOOOOL!",
+	"hacker",
+	"yoda",
+	"igor",
+	"groaaarrrrgghhhh!",
 },
 };
 
diff --git a/dists/engine-data/drascula.dat b/dists/engine-data/drascula.dat
index e2b046a..6346c52 100644
Binary files a/dists/engine-data/drascula.dat and b/dists/engine-data/drascula.dat differ
diff --git a/engines/drascula/animation.cpp b/engines/drascula/animation.cpp
index cb83292..c89e5ff 100644
--- a/engines/drascula/animation.cpp
+++ b/engines/drascula/animation.cpp
@@ -2080,7 +2080,7 @@ void DrasculaEngine::animation_1_4() {
 	debug(4, "animation_1_4()");
 
 	if (flags[21] == 0) {
-		strcpy(objName[2], "igor");
+		strcpy(objName[2], _textmisc[5]); // "igor"
 		talk(275);
 
 		updateRefresh_pre();
diff --git a/engines/drascula/drascula.h b/engines/drascula/drascula.h
index fa96fb5..a7eadcd 100644
--- a/engines/drascula/drascula.h
+++ b/engines/drascula/drascula.h
@@ -54,7 +54,7 @@
  */
 namespace Drascula {
 
-#define DRASCULA_DAT_VER 4
+#define DRASCULA_DAT_VER 5
 #define DATAALIGNMENT 4
 
 enum DrasculaGameFeatures {
diff --git a/engines/drascula/objects.cpp b/engines/drascula/objects.cpp
index 2a24e02..65c042a 100644
--- a/engines/drascula/objects.cpp
+++ b/engines/drascula/objects.cpp
@@ -111,7 +111,7 @@ void DrasculaEngine::checkObjects() {
 	if (_mouseX > curX + 2 && _mouseY > curY + 2
 			&& _mouseX < curX + curWidth - 2 && _mouseY < curY + curHeight - 2) {
 		if (currentChapter == 2 || !_hasName) {
-			strcpy(textName, "hacker");
+			strcpy(textName, _textmisc[3]); // "hacker"
 			_hasName = true;
 		}
 	}
diff --git a/engines/drascula/rooms.cpp b/engines/drascula/rooms.cpp
index b8dc51e..f99f00c 100644
--- a/engines/drascula/rooms.cpp
+++ b/engines/drascula/rooms.cpp
@@ -404,7 +404,7 @@ bool DrasculaEngine::room_13(int fl) {
 		talk(411);
 		trackProtagonist = 3;
 		talk(412);
-		strcpy(objName[1], "yoda");
+		strcpy(objName[1], _textmisc[4]); // "yoda"
 	} else if (pickedObject == kVerbTalk && fl == 51) {
 		converse(7);
 	} else if (pickedObject == 19 && fl == 51) {
diff --git a/engines/drascula/talk.cpp b/engines/drascula/talk.cpp
index aa79dab..7ae06c9 100644
--- a/engines/drascula/talk.cpp
+++ b/engines/drascula/talk.cpp
@@ -973,7 +973,7 @@ void DrasculaEngine::grr() {
 	copyBackground(253, 110, 150, 65, 20, 30, drawSurface3, screenSurface);
 
 	if (!_subtitlesDisabled)
-		centerText("groaaarrrrgghhhh!", 153, 65);
+		centerText(_textmisc[6], 153, 65); // "groaaarrrrgghhhh!"
 
 	updateScreen();
 





More information about the Scummvm-git-logs mailing list