thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

TONY: Fix German fonts

Browse source
This commit is contained in:
Strangerke 2012-09-28 10:50:20 +02:00
parent 41d337c549
commit 72e32ab35e
5 changed files with 40 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

2
devtools/create_tony/create_tony.h
View file

@ -28,7 +28,7 @@
#define DATAALIGNMENT 4 #define DATAALIGNMENT 4
#define TONY_DAT_VER_MAJ 0 // 1 byte #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 // Number of variants of the game. For the moment, it's the same
// as the number of languages // as the number of languages

74
devtools/create_tony/staticdata.h
View file

@ -1326,45 +1326,45 @@ const int _cTableObjDeu[] = {
13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22,
23, 24, 25, -1, -1, -1, -1, -1, -1, -1, 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, 91, -1, -1, 93, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 91, -1, -1, 93,
-1, -1, -1, 52, -1, -1, -1, -1, -1, 67, -1, -1, -1, 88, -1, 85, -1, -1, -1, 67,
-1, 60, -1, -1, 66, -1, -1, -1, -1, -1, -1, 60, -1, -1, 66, 92, -1, -1, -1, 88,
-1, -1, -1, -1, -1, -1, -1, 61, -1, -1, -1, -1, -1, -1, -1, 85, -1, 61, -1, -1,
-1, -1, -1, 69, -1, -1, 70, 71, 68, -1, -1, 92, -1, 69, -1, -1, 70, 71, 86, -1,
72, -1, -1, 73, 75, -1, -1, 76, -1, 65, 72, -1, 87, 73, 75, -1, -1, 76, -1, 89,
78, -1, -1, -1, 79, -1, -1, 81, -1, -1, 78, 90, -1, -1, 79, -1, -1, 81, -1, -1,
82, -1, -1, -1, -1, -1, -1, -1, 70, -1, 82, -1, -1, 142, -1, -1, -1, -1, 70, -1,
-1, 63, -1, -1, -1, -1, -1, -1, -1, -1, 86, 63, -1, -1, 87, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, 79, -1, 62, -1, -1, 89, -1, 90, -1, -1, 79, -1, 62, -1,
-1, -1, 82, -1, -1, -1}; -1, -1, 82, -1, -1, -1};
const int _lTableObjDeu[] = { 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, 26, 26, 26, 26, 26, 26, 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, 11, 26, 26, 26, 26, 26, 26, 8,
26, 26, 26, 26, 26, 12, 8, 26, 20, 20, 26, 26, 26, 26, 26, 12, 8, 26, 20, 20,
15, 20, 20, 20, 20, 20, 20, 20, 26, 26, 15, 20, 20, 20, 20, 20, 20, 20, 26, 26,
26, 26, 26, 26, 26, 17, 17, 19, 17, 15, 26, 26, 26, 26, 26, 17, 17, 19, 17, 15,
17, 19, 17, 16, 26, 17, 14, 19, 17, 19, 17, 19, 17, 16, 26, 17, 14, 19, 17, 19,
17, 19, 14, 13, 15, 15, 13, 19, 15, 13, 17, 19, 14, 13, 15, 15, 13, 19, 15, 13,
20, 26, 26, 26, 26, 26, 26, 17, 17, 19, 20, 26, 26, 26, 26, 26, 26, 17, 17, 19,
17, 15, 17, 19, 17, 16, 26, 17, 14, 19, 17, 15, 17, 19, 17, 16, 26, 17, 14, 19,
17, 19, 17, 19, 14, 13, 15, 15, 13, 19, 17, 19, 17, 19, 14, 13, 15, 15, 13, 19,
15, 13, 20, 26, 26, 26, 26, 26, 26, 26, 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, 15, 26, 26, 21, 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, 26, 19, 26, 20, 26, 26, 26, 26,
26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 21, 26, 26, 26, 19,
26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 20, 26, 26, 26, 26,
26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 21, 26, 26, 26, 26, 17, 26, 22, 26,
26, 26, 26, 26, 26, 26, 26, 26, 26, 17, 26, 26, 17, 26, 26, 26, 26, 26, 26, 17,
26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 22, 26, 26, 19, 26, 26, 26, 26, 26,
26, 26, 26, 26, 26, 142, 26, 26, 26, 26, 15, 26, 26, 24, 26, 26, 26, 26, 17, 26,
26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 22, 26, 26, 26, 17, 26, 26, 26, 26, 26,
26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 17, 26, 22, 26, 26, 19, 26, 26, 26,
26, 26, 26, 26, 26, 26}; 26, 26, 15, 26, 26, 26};
#endif #endif

BIN
dists/engine-data/tony.dat
View file

Binary file not shown.

2
engines/tony/tony.cpp
View file

@ -246,7 +246,7 @@ bool TonyEngine::loadTonyDat() {
} }
int numVariant = in.readUint16BE(); 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"); msg = Common::String::format("Font variant not present in 'tony.dat'. Get it from the ScummVM website");
GUIErrorMessage(msg); GUIErrorMessage(msg);
warning("%s", msg.c_str()); warning("%s", msg.c_str());

2
engines/tony/tony.h
View file

@ -71,7 +71,7 @@ struct TonyGameDescription;
#define MAX_SFX_CHANNELS 32 #define MAX_SFX_CHANNELS 32
#define TONY_DAT_VER_MAJ 0 #define TONY_DAT_VER_MAJ 0
#define TONY_DAT_VER_MIN 2 #define TONY_DAT_VER_MIN 3
struct VoiceHeader { struct VoiceHeader {
int _offset; int _offset;