diff options
author | Strangerke | 2016-05-23 01:49:50 +0200 |
---|---|---|
committer | Strangerke | 2016-05-23 01:49:50 +0200 |
commit | a586f7701d7e791668ed725d56a702dba64e8d65 (patch) | |
tree | 3fa16a778b7708e8aba0ee76715b169f6c7be959 | |
parent | 2a2082c1f9dcb3a85801d6813273ef8362caf6be (diff) | |
download | scummvm-rg350-a586f7701d7e791668ed725d56a702dba64e8d65.tar.gz scummvm-rg350-a586f7701d7e791668ed725d56a702dba64e8d65.tar.bz2 scummvm-rg350-a586f7701d7e791668ed725d56a702dba64e8d65.zip |
GNAP: Remove useless in ResourceClass constructor
-rw-r--r-- | engines/gnap/resource.cpp | 11 | ||||
-rw-r--r-- | engines/gnap/resource.h | 8 |
2 files changed, 8 insertions, 11 deletions
diff --git a/engines/gnap/resource.cpp b/engines/gnap/resource.cpp index bb5dba0382..8244213a7f 100644 --- a/engines/gnap/resource.cpp +++ b/engines/gnap/resource.cpp @@ -59,9 +59,9 @@ void SequenceAnimation::loadFromStream(Common::MemoryReadStream &stream) { } // SequenceResource - -SequenceResource::SequenceResource(int resourceId, byte *data, uint32 size) { +SequenceResource::SequenceResource(byte *data, uint32 size) { Common::MemoryReadStream stream(data, size, DisposeAfterUse::NO); + // Skip an unused value stream.readUint32LE(); @@ -84,7 +84,6 @@ SequenceResource::SequenceResource(int resourceId, byte *data, uint32 size) { _animations[i].loadFromStream(stream); stream.seek(oldOffs); } - // TODO Convert resourceIds } SequenceResource::~SequenceResource() { @@ -92,8 +91,7 @@ SequenceResource::~SequenceResource() { } // SpriteResource - -SpriteResource::SpriteResource(int resourceId, byte *data, uint32 size) { +SpriteResource::SpriteResource(byte *data, uint32 size) { _data = data; _width = READ_LE_UINT16(_data); _height = READ_LE_UINT16(_data + 2); @@ -111,8 +109,7 @@ SpriteResource::~SpriteResource() { } // SoundResource - -SoundResource::SoundResource(int resourceId, byte *data, uint32 size) { +SoundResource::SoundResource(byte *data, uint32 size) { _data = data; _size = size; } diff --git a/engines/gnap/resource.h b/engines/gnap/resource.h index 1b228de81e..29bd31c88f 100644 --- a/engines/gnap/resource.h +++ b/engines/gnap/resource.h @@ -66,7 +66,7 @@ struct SequenceAnimation { class SequenceResource { public: - SequenceResource(int resourceId, byte *data, uint32 size); + SequenceResource(byte *data, uint32 size); ~SequenceResource(); public: int32 _sequenceId; @@ -83,7 +83,7 @@ public: class SpriteResource { public: - SpriteResource(int resourceId, byte *data, uint32 size); + SpriteResource(byte *data, uint32 size); ~SpriteResource(); public: byte *_data; @@ -98,7 +98,7 @@ public: class SoundResource { public: - SoundResource(int resourceId, byte *data, uint32 size); + SoundResource(byte *data, uint32 size); ~SoundResource(); public: byte *_data; @@ -172,7 +172,7 @@ protected: byte *resourceData = _dat->loadResource(resourceId); uint32 resourceSize = _dat->getResourceSize(resourceId); - ResourceClass *obj = new ResourceClass(resourceId, resourceData, resourceSize); + ResourceClass *obj = new ResourceClass(resourceData, resourceSize); if (FreeAfterLoad) delete[] resourceData; return obj; |