diff options
| author | Paul Gilbert | 2008-01-17 09:45:40 +0000 |
|---|---|---|
| committer | Paul Gilbert | 2008-01-17 09:45:40 +0000 |
| commit | 62a0715200612814f5ac4e09ff5cc6eddb26142e (patch) | |
| tree | dc1fd6f5cb20afdc31bd7ab195807f8c363222cf | |
| parent | 00ecb126e3bb9ec83935a2b07eb423a31dfaa46e (diff) | |
| download | scummvm-rg350-62a0715200612814f5ac4e09ff5cc6eddb26142e.tar.gz scummvm-rg350-62a0715200612814f5ac4e09ff5cc6eddb26142e.tar.bz2 scummvm-rg350-62a0715200612814f5ac4e09ff5cc6eddb26142e.zip | |
Corrected offset for animation of player operating rack in German version, and cleaned up the talk data reader which should fix some bad talk data being generated for the German version
svn-id: r30525
| -rw-r--r-- | dists/engine-data/lure.dat | bin | 637504 -> 637824 bytes | |||
| -rw-r--r-- | tools/create_lure/create_lure_dat.cpp | 7 | ||||
| -rw-r--r-- | tools/create_lure/create_lure_dat.h | 2 |
3 files changed, 6 insertions, 3 deletions
diff --git a/dists/engine-data/lure.dat b/dists/engine-data/lure.dat Binary files differindex 070f2a6ad4..dbbfc45c47 100644 --- a/dists/engine-data/lure.dat +++ b/dists/engine-data/lure.dat diff --git a/tools/create_lure/create_lure_dat.cpp b/tools/create_lure/create_lure_dat.cpp index 7c6f1754fa..a89593d9c5 100644 --- a/tools/create_lure/create_lure_dat.cpp +++ b/tools/create_lure/create_lure_dat.cpp @@ -103,7 +103,7 @@ AnimListRecord animDataList[] = { {{0x5A62, 0x5B22, 0x5B42, 0x5b72, 0x5b42}}, // Minnow pulling lever in room #48 {{0x5AAA, 0x5B6A, 0x5B8A, 0x5bba, 0x5b8a}}, // Goewin mixing potion {{0x5C80, 0x5D40, 0x5D60, 0x5d90, 0x5d60}}, // Player standard animation - {{0x5C95, 0x5D55, 0x5D75, 0x5db5, 0x5d75}}, // Player operating rack + {{0x5C95, 0x5D55, 0x5D75, 0x5da5, 0x5d75}}, // Player operating rack {{0x5CAA, 0x5D6A, 0x5D8A, 0x5dba, 0x5d8a}}, // Selena animation {{0x5CE9, 0x5DA9, 0x5DC9, 0x5df9, 0x5dc9}}, // Blacksmith default {{0x5D28, 0x5DE8, 0x5E08, 0x5e38, 0x5e08}}, // Goewin animation @@ -1018,7 +1018,10 @@ void read_talk_headers(byte *&data, uint16 &totalSize) { sortedOffsets[entryCtr] = currVal; prevVal = currVal; } - sortedOffsets[entryCtr] = 0x5540; // end for end record + + // Assume that the last talk header will have the same number of entries across language versions, + // so create an end address based on the start of the last entry using start/end from English version + sortedOffsets[entryCtr] = sortedOffsets[entryCtr - 1] + (0x5540 - 0x5504); data = (byte *) malloc(MAX_DATA_SIZE); TalkEntry *entry = (TalkEntry *) data; diff --git a/tools/create_lure/create_lure_dat.h b/tools/create_lure/create_lure_dat.h index 9a9cef58ea..1677c10b97 100644 --- a/tools/create_lure/create_lure_dat.h +++ b/tools/create_lure/create_lure_dat.h @@ -30,7 +30,7 @@ #include "common/util.h" #define VERSION_MAJOR 1 -#define VERSION_MINOR 28 +#define VERSION_MINOR 29 #define DIALOG_SIZE 0x150 |