aboutsummaryrefslogtreecommitdiff
path: root/engines/kyra/staticres.cpp
diff options
context:
space:
mode:
authorFlorian Kagerer2009-01-18 18:20:33 +0000
committerFlorian Kagerer2009-01-18 18:20:33 +0000
commit35c8fd4dadd9243f73034e9855a88e227a6100ad (patch)
tree6be2e0c9c068ad03b8fd4b1a2fb6f1baaf34c4e1 /engines/kyra/staticres.cpp
parent66228f77e9e405402515de984cc6062d60cedb70 (diff)
downloadscummvm-rg350-35c8fd4dadd9243f73034e9855a88e227a6100ad.tar.gz
scummvm-rg350-35c8fd4dadd9243f73034e9855a88e227a6100ad.tar.bz2
scummvm-rg350-35c8fd4dadd9243f73034e9855a88e227a6100ad.zip
LOL: fix some valgrind warnings
svn-id: r35910
Diffstat (limited to 'engines/kyra/staticres.cpp')
-rw-r--r--engines/kyra/staticres.cpp4
1 files changed, 1 insertions, 3 deletions
diff --git a/engines/kyra/staticres.cpp b/engines/kyra/staticres.cpp
index 8882bed10c..45af54caea 100644
--- a/engines/kyra/staticres.cpp
+++ b/engines/kyra/staticres.cpp
@@ -43,7 +43,7 @@
namespace Kyra {
-#define RESFILE_VERSION 33
+#define RESFILE_VERSION 34
namespace {
bool checkKyraDat(Common::SeekableReadStream *file) {
@@ -394,7 +394,6 @@ bool StaticResource::init() {
{ lolDscBlockMap, kRawData, "DSCBLOCK1.DEF" },
{ lolDscDimMap, kRawData, "DSCDIM.DEF" },
{ lolDscDoorScale, lolRawDataBe16, "DSCDOOR3.DEF" },
- { lolDscDoor2, kRawData, "DSCDOOR2.DEF" },
{ lolDscDoor4, lolRawDataBe16, "DSCDOOR4.DEF" },
{ lolDscOvlIndex, kRawData, "DSCBLOCK2.DEF" },
{ lolDscBlockIndex, kRawData, "DSCBLOCKX.DEF" },
@@ -1652,7 +1651,6 @@ void LoLEngine::initStaticResource() {
_dscBlockMap = _staticres->loadRawData(lolDscBlockMap, _dscBlockMapSize);
_dscDimMap = _staticres->loadRawData(lolDscDimMap, _dscDimMapSize);
_dscDoorScaleTable = (const uint16 *)_staticres->loadRawDataBe16(lolDscDoorScale, _dscDoorScaleTableSize);
- _dscDoor2 = _staticres->loadRawData(lolDscDoor2, _dscDoor2Size);
_dscShapeOvlIndex = _staticres->loadRawData(lolDscOvlIndex, _dscShapeOvlIndexSize);
_dscDoor4 = (const uint16 *)_staticres->loadRawDataBe16(lolDscDoor4, _dscDoor4Size);
_dscBlockIndex = (const int8 *)_staticres->loadRawData(lolDscBlockIndex, _dscBlockIndexSize);