diff options
| author | Florian Kagerer | 2009-01-18 18:20:33 +0000 |
|---|---|---|
| committer | Florian Kagerer | 2009-01-18 18:20:33 +0000 |
| commit | 35c8fd4dadd9243f73034e9855a88e227a6100ad (patch) | |
| tree | 6be2e0c9c068ad03b8fd4b1a2fb6f1baaf34c4e1 /tools/create_kyradat | |
| parent | 66228f77e9e405402515de984cc6062d60cedb70 (diff) | |
| download | scummvm-rg350-35c8fd4dadd9243f73034e9855a88e227a6100ad.tar.gz scummvm-rg350-35c8fd4dadd9243f73034e9855a88e227a6100ad.tar.bz2 scummvm-rg350-35c8fd4dadd9243f73034e9855a88e227a6100ad.zip | |
LOL: fix some valgrind warnings
svn-id: r35910
Diffstat (limited to 'tools/create_kyradat')
| -rw-r--r-- | tools/create_kyradat/create_kyradat.cpp | 3 | ||||
| -rw-r--r-- | tools/create_kyradat/create_kyradat.h | 1 | ||||
| -rw-r--r-- | tools/create_kyradat/lol_cd.h | 3 | ||||
| -rw-r--r-- | tools/create_kyradat/misc.h | 2 |
4 files changed, 2 insertions, 7 deletions
diff --git a/tools/create_kyradat/create_kyradat.cpp b/tools/create_kyradat/create_kyradat.cpp index 51524e57a0..6544d9c2cd 100644 --- a/tools/create_kyradat/create_kyradat.cpp +++ b/tools/create_kyradat/create_kyradat.cpp @@ -31,7 +31,7 @@ #include "md5.h" enum { - kKyraDatVersion = 33, + kKyraDatVersion = 34, kIndexSize = 12 }; @@ -289,7 +289,6 @@ const ExtractFilename extractFilenames[] = { { lolDscBlockMap, kTypeRawData, "DSCBLOCK1.DEF" }, { lolDscDimMap, kTypeRawData, "DSCDIM.DEF" }, { lolDscDoorScale, lolTypeRaw16, "DSCDOOR3.DEF" }, - { lolDscDoor2, k3TypeRaw16to8, "DSCDOOR2.DEF" }, { lolDscShapeOvlIndex, k3TypeRaw16to8, "DSCBLOCK2.DEF" }, { lolDscBlockIndex, kTypeRawData, "DSCBLOCKX.DEF" }, { lolDscDoor4, lolTypeRaw16, "DSCDOOR4.DEF" }, diff --git a/tools/create_kyradat/create_kyradat.h b/tools/create_kyradat/create_kyradat.h index 8c1fd3f84b..8ffdc40c5f 100644 --- a/tools/create_kyradat/create_kyradat.h +++ b/tools/create_kyradat/create_kyradat.h @@ -204,7 +204,6 @@ enum kExtractID { lolDscShapeOvlIndex, lolDscBlockIndex, lolDscDoor1, - lolDscDoor2, lolDscDoorScale, lolDscDoor4, lolDscDoorX, diff --git a/tools/create_kyradat/lol_cd.h b/tools/create_kyradat/lol_cd.h index 8380b9961e..bf57fa9f23 100644 --- a/tools/create_kyradat/lol_cd.h +++ b/tools/create_kyradat/lol_cd.h @@ -25,8 +25,7 @@ const ExtractEntry lolCDFile2[] = { { lolDscBlockMap, 0x00031B64, 0x00031B70 }, { lolDscDimMap, 0x00031B70, 0x00031B82 }, { lolDscDoorScale, 0x00031B82, 0x00031B92 }, - { lolDscDoor2, 0x00031B92, 0x00031B9A }, - { lolDscShapeOvlIndex, 0x00031B9A, 0x00031BBA }, + { lolDscShapeOvlIndex, 0x00031B92, 0x00031BBA }, { lolDscDoor4, 0x00031BBA, 0x00031BC2 }, { lolDscBlockIndex, 0x00033B53, 0x00033B9B }, { lolDscDoor1, 0x0002B550, 0x0002B5D0 }, diff --git a/tools/create_kyradat/misc.h b/tools/create_kyradat/misc.h index 91ee915319..36b5ebe1ce 100644 --- a/tools/create_kyradat/misc.h +++ b/tools/create_kyradat/misc.h @@ -506,11 +506,9 @@ const int lolCDFile2Need[] = { lolDscDimData2, lolDscBlockMap, lolDscDimMap, - lolDscDoor2, lolDscShapeOvlIndex, lolDscBlockIndex, lolDscDoor1, - lolDscDoor2, lolDscDoorScale, lolDscDoor4, lolDscDoorX, |