[Scummvm-cvs-logs] SF.net SVN: scummvm:[38246] scummvm/trunk
athrxx at users.sourceforge.net
athrxx at users.sourceforge.net
Sun Feb 15 15:49:01 CET 2009
Revision: 38246
http://scummvm.svn.sourceforge.net/scummvm/?rev=38246&view=rev
Author: athrxx
Date: 2009-02-15 14:49:01 +0000 (Sun, 15 Feb 2009)
Log Message:
-----------
LOL: fix bug in kyra.dat
Modified Paths:
--------------
scummvm/trunk/dists/engine-data/kyra.dat
scummvm/trunk/engines/kyra/staticres.cpp
scummvm/trunk/tools/create_kyradat/create_kyradat.cpp
Modified: scummvm/trunk/dists/engine-data/kyra.dat
===================================================================
(Binary files differ)
Modified: scummvm/trunk/engines/kyra/staticres.cpp
===================================================================
--- scummvm/trunk/engines/kyra/staticres.cpp 2009-02-15 14:46:42 UTC (rev 38245)
+++ scummvm/trunk/engines/kyra/staticres.cpp 2009-02-15 14:49:01 UTC (rev 38246)
@@ -44,7 +44,7 @@
namespace Kyra {
-#define RESFILE_VERSION 37
+#define RESFILE_VERSION 38
namespace {
bool checkKyraDat(Common::SeekableReadStream *file) {
Modified: scummvm/trunk/tools/create_kyradat/create_kyradat.cpp
===================================================================
--- scummvm/trunk/tools/create_kyradat/create_kyradat.cpp 2009-02-15 14:46:42 UTC (rev 38245)
+++ scummvm/trunk/tools/create_kyradat/create_kyradat.cpp 2009-02-15 14:49:01 UTC (rev 38246)
@@ -31,7 +31,7 @@
#include "md5.h"
enum {
- kKyraDatVersion = 37,
+ kKyraDatVersion = 38,
kIndexSize = 12
};
@@ -1074,7 +1074,7 @@
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 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 @@
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) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list