diff options
| author | Florian Kagerer | 2009-02-15 14:49:01 +0000 |
|---|---|---|
| committer | Florian Kagerer | 2009-02-15 14:49:01 +0000 |
| commit | dee51a77b57bcebcb20bb14a8fe1314b9e194a55 (patch) | |
| tree | b7ab4d15bbfac4c1a266560dce23f5cf0e296086 | |
| parent | 9daed50e0165f387f597fec4d06b57805e1f717c (diff) | |
| download | scummvm-rg350-dee51a77b57bcebcb20bb14a8fe1314b9e194a55.tar.gz scummvm-rg350-dee51a77b57bcebcb20bb14a8fe1314b9e194a55.tar.bz2 scummvm-rg350-dee51a77b57bcebcb20bb14a8fe1314b9e194a55.zip | |
LOL: fix bug in kyra.dat
svn-id: r38246
| -rw-r--r-- | dists/engine-data/kyra.dat | bin | 256040 -> 255660 bytes | |||
| -rw-r--r-- | engines/kyra/staticres.cpp | 2 | ||||
| -rw-r--r-- | tools/create_kyradat/create_kyradat.cpp | 7 |
3 files changed, 5 insertions, 4 deletions
diff --git a/dists/engine-data/kyra.dat b/dists/engine-data/kyra.dat Binary files differindex ee8ac14590..d31c53dd4d 100644 --- a/dists/engine-data/kyra.dat +++ b/dists/engine-data/kyra.dat diff --git a/engines/kyra/staticres.cpp b/engines/kyra/staticres.cpp index 7bd556cebf..68ffa15ad4 100644 --- a/engines/kyra/staticres.cpp +++ b/engines/kyra/staticres.cpp @@ -44,7 +44,7 @@ namespace Kyra { -#define RESFILE_VERSION 37 +#define RESFILE_VERSION 38 namespace { bool checkKyraDat(Common::SeekableReadStream *file) { diff --git a/tools/create_kyradat/create_kyradat.cpp b/tools/create_kyradat/create_kyradat.cpp index 26d8bf7984..3b1b43a2b1 100644 --- a/tools/create_kyradat/create_kyradat.cpp +++ b/tools/create_kyradat/create_kyradat.cpp @@ -31,7 +31,7 @@ #include "md5.h" enum { - kKyraDatVersion = 37, + kKyraDatVersion = 38, kIndexSize = 12 }; @@ -1074,7 +1074,7 @@ bool extractRaw16(PAKFile &out, const Game *g, const byte *data, const uint32 si const uint8 *src = data; uint8 *dst = buffer; - for (uint i = 0; i < (size >> 1); i++) { + for (uint32 i = 0; i < (size >> 1); i++) { WRITE_BE_UINT16(dst, READ_LE_UINT16(src)); src += 2; dst += 2; @@ -1086,6 +1086,7 @@ bool extractRaw16(PAKFile &out, const Game *g, const byte *data, const uint32 si bool extractLolButtonDefs(PAKFile &out, const Game *g, const byte *data, const uint32 size, const char *filename, int fmtPatch) { int num = size / 22; uint8 *buffer = new uint8[size]; + uint32 outsize = num * 18; const uint8 *src = data; uint8 *dst = buffer; @@ -1110,7 +1111,7 @@ bool extractLolButtonDefs(PAKFile &out, const Game *g, const byte *data, const u src += 2; dst += 2; } - return out.addFile(filename, buffer, size); + return out.addFile(filename, buffer, outsize); } bool extractMrShapeAnimData(PAKFile &out, const Game *g, const byte *data, const uint32 size, const char *filename, int fmtPatch) { |