[Scummvm-cvs-logs] scummvm master -> 5a18453863a495c92788e117c73b8003f0ee9531
Strangerke
Strangerke at scummvm.org
Fri Sep 28 12:19:55 CEST 2012
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:
72e32ab35e TONY: Fix German fonts
5a18453863 TONY: Update the Obj tables in other languages
Commit: 72e32ab35e3a4681a6dd1cdac3c6c67d89ab057c
https://github.com/scummvm/scummvm/commit/72e32ab35e3a4681a6dd1cdac3c6c67d89ab057c
Author: Strangerke (strangerke at scummvm.org)
Date: 2012-09-28T01:58:32-07:00
Commit Message:
TONY: Fix German fonts
Changed paths:
devtools/create_tony/create_tony.h
devtools/create_tony/staticdata.h
dists/engine-data/tony.dat
engines/tony/tony.cpp
engines/tony/tony.h
diff --git a/devtools/create_tony/create_tony.h b/devtools/create_tony/create_tony.h
index 073e977..3075835 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 eb05297..0b19679 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 51dd7cd..7d564d7 100644
Binary files a/dists/engine-data/tony.dat and b/dists/engine-data/tony.dat differ
diff --git a/engines/tony/tony.cpp b/engines/tony/tony.cpp
index 695801a..1c63096 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 d22ff24..332b122 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;
Commit: 5a18453863a495c92788e117c73b8003f0ee9531
https://github.com/scummvm/scummvm/commit/5a18453863a495c92788e117c73b8003f0ee9531
Author: Strangerke (strangerke at scummvm.org)
Date: 2012-09-28T03:19:05-07:00
Commit Message:
TONY: Update the Obj tables in other languages
Changed paths:
devtools/create_tony/staticdata.h
dists/engine-data/tony.dat
diff --git a/devtools/create_tony/staticdata.h b/devtools/create_tony/staticdata.h
index 0b19679..fff977d 100644
--- a/devtools/create_tony/staticdata.h
+++ b/devtools/create_tony/staticdata.h
@@ -1046,17 +1046,17 @@ const int _cTableObjIta[] = {
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,
+ 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, -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,
+ 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 _lTableObjIta[] = {
@@ -1074,18 +1074,18 @@ const int _lTableObjIta[] = {
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, 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};
+ 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, 26, 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};
const int _cTableObjPol[] = {
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
@@ -1135,13 +1135,13 @@ const int _lTableObjPol[] = {
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, 26, 26, 22, 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, 26, 26, 26, 26, 26, 26,
- 26, 26, 26, 26, 26, 26, 26, 26, 26, 26,
+ 26, 22, 26, 26, 19, 26, 26, 26, 26, 26,
+ 15, 26, 26, 26, 26, 26, 26, 26, 17, 26,
22, 26, 26, 26, 17, 26, 26, 26, 26, 26,
- 26, 17, 26, 22, 26, 26, 26, 26, 26, 26,
- 26, 26, 26, 26, 26, 26};
+ 26, 17, 26, 22, 26, 26, 19, 26, 26, 26,
+ 26, 26, 15, 26, 26, 26};
const int _cTableObjRus[] = {
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
@@ -1158,12 +1158,12 @@ const int _cTableObjRus[] = {
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, 85, -1, -1, 100, 67,
- -1, 60, -1, -1, 66, -1, -1, -1, -1, -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, 100, 67,
+ -1, 60, -1, -1, 66, 92, -1, -1, -1, 88,
-1, -1, -1, -1, 100, 85, -1, 61, -1, -1,
- -1, -1, 94, 95, 96, 97, 98, 99, 101, 102,
+ -1, 92, 94, 95, 96, 97, 98, 99, 101, 102,
103, 104, 105, 106, 107, 108, 109, 110, 111, 112,
113, 114, 115, 116, 117, 118, 119, 120, 122, 123,
121, 124, 125, 126, 94, 95, 96, 97, 98, 99,
@@ -1186,12 +1186,12 @@ const int _lTableObjRus[] = {
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, 20, 26, 26, 18, 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, 18, 26,
+ 26, 26, 26, 26, 26, 21, 26, 26, 26, 19,
26, 26, 26, 26, 18, 20, 26, 26, 26, 26,
- 26, 26, 18, 18, 18, 17, 16, 18, 20, 18,
+ 26, 21, 18, 18, 18, 17, 16, 18, 20, 18,
18, 18, 18, 16, 18, 15, 22, 15, 18, 22,
19, 16, 21, 20, 16, 16, 19, 22, 19, 19,
18, 15, 18, 18, 18, 18, 18, 17, 16, 18,
@@ -1214,17 +1214,17 @@ const int _cTableObjCze[] = {
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, 128, -1,
- -1, 137, 131, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, 128, -1, -1, 137, 131, -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, 133, -1, -1, 70, 71, 68, -1,
- 129, 135, -1, 73, 127, 134, -1, 136, -1, 65,
+ 91, 137, 131, 93, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, 128, -1, 91, 137, 131, 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, 133, -1, -1, 70, 71, 86, -1,
+ 129, 135, 87, 73, 127, 134, -1, 136, -1, 89,
138, 139, -1, -1, 79, -1, 130, 140, 141, -1,
82, 132, -1, -1, -1, 133, -1, -1, 70, -1,
- -1, 63, 129, 135, -1, -1, 127, 134, -1, 136,
- -1, -1, 138, 139, -1, -1, 79, -1, 130, 140,
+ 86, 63, 129, 135, 87, -1, 127, 134, -1, 136,
+ -1, 89, 138, 139, -1, -1, 79, -1, 130, 140,
141, -1, 82, 132, -1, -1};
const int _lTableObjCze[] = {
@@ -1242,18 +1242,18 @@ const int _lTableObjCze[] = {
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, 15, 26,
- 26, 24, 21, 26, 26, 26, 26, 26, 26, 26,
- 26, 26, 26, 26, 15, 26, 26, 24, 21, 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, 18, 26, 26, 26, 26, 26, 26,
- 22, 17, 26, 26, 17, 19, 26, 23, 26, 17,
- 17, 22, 26, 26, 26, 26, 18, 16, 16, 26,
- 26, 16, 26, 26, 26, 18, 26, 26, 26, 26,
- 26, 26, 22, 17, 26, 26, 17, 19, 26, 23,
- 26, 26, 17, 22, 26, 26, 26, 26, 18, 16,
- 16, 26, 26, 16, 26, 26};
+ 15, 24, 21, 21, 26, 26, 26, 26, 26, 26,
+ 26, 26, 26, 26, 15, 26, 15, 24, 21, 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, 18, 26, 26, 17, 26, 22, 26,
+ 22, 17, 17, 26, 17, 19, 26, 23, 26, 17,
+ 17, 22, 26, 26, 19, 26, 18, 16, 16, 26,
+ 15, 16, 26, 26, 26, 18, 26, 26, 17, 26,
+ 22, 26, 22, 17, 17, 26, 17, 19, 26, 23,
+ 26, 17, 17, 22, 26, 26, 19, 26, 18, 16,
+ 16, 26, 15, 16, 26, 26};
const int _cTableObjFra[] = {
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
@@ -1303,13 +1303,13 @@ const int _lTableObjFra[] = {
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, 26, 26, 22, 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, 26, 26, 26, 26, 26, 26,
- 26, 26, 26, 26, 17, 17, 17, 26, 26, 26,
+ 26, 22, 26, 26, 19, 26, 26, 26, 26, 26,
+ 15, 26, 26, 26, 17, 17, 17, 26, 17, 26,
22, 26, 15, 15, 17, 26, 16, 16, 16, 26,
26, 17, 19, 19, 19, 26, 19, 26, 26, 15,
- 26, 15, 26, 26, 26, 26};
+ 26, 15, 15, 26, 26, 26};
const int _cTableObjDeu[] = {
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
diff --git a/dists/engine-data/tony.dat b/dists/engine-data/tony.dat
index 7d564d7..5ea53c6 100644
Binary files a/dists/engine-data/tony.dat and b/dists/engine-data/tony.dat differ
More information about the Scummvm-git-logs
mailing list