aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--devtools/create_tony/create_tony.h2
-rw-r--r--devtools/create_tony/staticdata.h74
-rw-r--r--dists/engine-data/tony.datbin24584 -> 24584 bytes
-rw-r--r--engines/tony/tony.cpp2
-rw-r--r--engines/tony/tony.h2
5 files changed, 40 insertions, 40 deletions
diff --git a/devtools/create_tony/create_tony.h b/devtools/create_tony/create_tony.h
index 073e97757d..3075835bd9 100644
--- a/devtools/create_tony/create_tony.h
+++ b/devtools/create_tony/create_tony.h
@@ -28,7 +28,7 @@
#define DATAALIGNMENT 4
#define TONY_DAT_VER_MAJ 0 // 1 byte
-#define TONY_DAT_VER_MIN 2 // 1 byte
+#define TONY_DAT_VER_MIN 3 // 1 byte
// Number of variants of the game. For the moment, it's the same
// as the number of languages
diff --git a/devtools/create_tony/staticdata.h b/devtools/create_tony/staticdata.h
index eb05297e96..0b19679631 100644
--- a/devtools/create_tony/staticdata.h
+++ b/devtools/create_tony/staticdata.h
@@ -1326,45 +1326,45 @@ const int _cTableObjDeu[] = {
13, 14, 15, 16, 17, 18, 19, 20, 21, 22,
23, 24, 25, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, 52, -1, -1, -1, -1, -1, 67,
- -1, 60, -1, -1, 66, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, 61, -1, -1,
- -1, -1, -1, 69, -1, -1, 70, 71, 68, -1,
- 72, -1, -1, 73, 75, -1, -1, 76, -1, 65,
- 78, -1, -1, -1, 79, -1, -1, 81, -1, -1,
- 82, -1, -1, -1, -1, -1, -1, -1, 70, -1,
- -1, 63, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, 79, -1, 62, -1,
+ 91, -1, -1, 93, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, 91, -1, -1, 93,
+ -1, -1, -1, 88, -1, 85, -1, -1, -1, 67,
+ -1, 60, -1, -1, 66, 92, -1, -1, -1, 88,
+ -1, -1, -1, -1, -1, 85, -1, 61, -1, -1,
+ -1, 92, -1, 69, -1, -1, 70, 71, 86, -1,
+ 72, -1, 87, 73, 75, -1, -1, 76, -1, 89,
+ 78, 90, -1, -1, 79, -1, -1, 81, -1, -1,
+ 82, -1, -1, 142, -1, -1, -1, -1, 70, -1,
+ 86, 63, -1, -1, 87, -1, -1, -1, -1, -1,
+ -1, 89, -1, 90, -1, -1, 79, -1, 62, -1,
-1, -1, 82, -1, -1, -1};
const int _lTableObjDeu[] = {
- 26, 26, 26, 26, 26, 26, 26, 26, 26, 26,
- 26, 26, 26, 26, 26, 26, 26, 26, 26, 26,
- 26, 26, 26, 26, 26, 26, 26, 26, 26, 26,
- 26, 26, 11, 26, 26, 26, 26, 26, 26, 8,
- 26, 26, 26, 26, 26, 12, 8, 26, 20, 20,
- 15, 20, 20, 20, 20, 20, 20, 20, 26, 26,
- 26, 26, 26, 26, 26, 17, 17, 19, 17, 15,
- 17, 19, 17, 16, 26, 17, 14, 19, 17, 19,
- 17, 19, 14, 13, 15, 15, 13, 19, 15, 13,
- 20, 26, 26, 26, 26, 26, 26, 17, 17, 19,
- 17, 15, 17, 19, 17, 16, 26, 17, 14, 19,
- 17, 19, 17, 19, 14, 13, 15, 15, 13, 19,
- 15, 13, 20, 26, 26, 26, 26, 26, 26, 26,
- 26, 26, 26, 26, 26, 26, 26, 26, 26, 26,
- 26, 26, 26, 26, 26, 26, 26, 26, 26, 26,
- 26, 26, 26, 26, 26, 26, 26, 26, 26, 26,
- 26, 26, 26, 26, 26, 26, 26, 26, 26, 26,
- 26, 26, 26, 26, 26, 26, 26, 26, 26, 26,
- 26, 26, 26, 26, 26, 26, 26, 26, 26, 26,
- 26, 26, 26, 26, 26, 26, 26, 26, 26, 26,
- 26, 26, 26, 26, 26, 26, 26, 26, 26, 17,
- 26, 26, 26, 26, 26, 26, 26, 26, 26, 26,
- 26, 26, 26, 26, 26, 142, 26, 26, 26, 26,
- 26, 26, 26, 26, 26, 26, 26, 26, 26, 26,
- 26, 26, 26, 26, 26, 26, 26, 26, 26, 26,
- 26, 26, 26, 26, 26, 26};
+ 26, 26, 26, 26, 26, 26, 26, 26, 26, 26,
+ 26, 26, 26, 26, 26, 26, 26, 26, 26, 26,
+ 26, 26, 26, 26, 26, 26, 26, 26, 26, 26,
+ 26, 26, 11, 26, 26, 26, 26, 26, 26, 8,
+ 26, 26, 26, 26, 26, 12, 8, 26, 20, 20,
+ 15, 20, 20, 20, 20, 20, 20, 20, 26, 26,
+ 26, 26, 26, 26, 26, 17, 17, 19, 17, 15,
+ 17, 19, 17, 16, 26, 17, 14, 19, 17, 19,
+ 17, 19, 14, 13, 15, 15, 13, 19, 15, 13,
+ 20, 26, 26, 26, 26, 26, 26, 17, 17, 19,
+ 17, 15, 17, 19, 17, 16, 26, 17, 14, 19,
+ 17, 19, 17, 19, 14, 13, 15, 15, 13, 19,
+ 15, 13, 20, 26, 26, 26, 26, 26, 26, 26,
+ 26, 26, 26, 26, 26, 26, 26, 26, 26, 26,
+ 15, 26, 26, 21, 26, 26, 26, 26, 26, 26,
+ 26, 26, 26, 26, 26, 26, 15, 26, 26, 21,
+ 26, 26, 26, 19, 26, 20, 26, 26, 26, 26,
+ 26, 26, 26, 26, 26, 21, 26, 26, 26, 19,
+ 26, 26, 26, 26, 26, 20, 26, 26, 26, 26,
+ 26, 21, 26, 26, 26, 26, 17, 26, 22, 26,
+ 26, 26, 17, 26, 26, 26, 26, 26, 26, 17,
+ 26, 22, 26, 26, 19, 26, 26, 26, 26, 26,
+ 15, 26, 26, 24, 26, 26, 26, 26, 17, 26,
+ 22, 26, 26, 26, 17, 26, 26, 26, 26, 26,
+ 26, 17, 26, 22, 26, 26, 19, 26, 26, 26,
+ 26, 26, 15, 26, 26, 26};
#endif
diff --git a/dists/engine-data/tony.dat b/dists/engine-data/tony.dat
index 51dd7cd675..7d564d7309 100644
--- a/dists/engine-data/tony.dat
+++ b/dists/engine-data/tony.dat
Binary files differ
diff --git a/engines/tony/tony.cpp b/engines/tony/tony.cpp
index 695801ad90..1c63096e92 100644
--- a/engines/tony/tony.cpp
+++ b/engines/tony/tony.cpp
@@ -246,7 +246,7 @@ bool TonyEngine::loadTonyDat() {
}
int numVariant = in.readUint16BE();
- if (expectedLangVariant > numVariant) {
+ if (expectedLangVariant > numVariant - 1) {
msg = Common::String::format("Font variant not present in 'tony.dat'. Get it from the ScummVM website");
GUIErrorMessage(msg);
warning("%s", msg.c_str());
diff --git a/engines/tony/tony.h b/engines/tony/tony.h
index d22ff247f3..332b122923 100644
--- a/engines/tony/tony.h
+++ b/engines/tony/tony.h
@@ -71,7 +71,7 @@ struct TonyGameDescription;
#define MAX_SFX_CHANNELS 32
#define TONY_DAT_VER_MAJ 0
-#define TONY_DAT_VER_MIN 2
+#define TONY_DAT_VER_MIN 3
struct VoiceHeader {
int _offset;