diff options
| author | Filippos Karapetis | 2019-06-10 01:52:35 +0300 |
|---|---|---|
| committer | Filippos Karapetis | 2019-06-11 00:48:16 +0300 |
| commit | 709d606e016235b663e04b9abfa9d537bdc753f0 (patch) | |
| tree | 0f7376571ed0d239e1bbc96d72b5a842caf55187 /engines/startrek/actors.cpp | |
| parent | 3f7f1a24108b1333908e82fd01455ea4f863afd3 (diff) | |
| download | scummvm-rg350-709d606e016235b663e04b9abfa9d537bdc753f0.tar.gz scummvm-rg350-709d606e016235b663e04b9abfa9d537bdc753f0.tar.bz2 scummvm-rg350-709d606e016235b663e04b9abfa9d537bdc753f0.zip | |
STARTREK: Adapt many usages of Common::SharedPtr() to regular pointers
Diffstat (limited to 'engines/startrek/actors.cpp')
| -rw-r--r-- | engines/startrek/actors.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/engines/startrek/actors.cpp b/engines/startrek/actors.cpp index 1e0d8b6d2a..21b2892868 100644 --- a/engines/startrek/actors.cpp +++ b/engines/startrek/actors.cpp @@ -68,7 +68,7 @@ void StarTrekEngine::loadBanFile(const Common::String &name) { debugC(kDebugGeneral, 7, "Load BAN file: %s.ban", name.c_str()); for (int i = 0; i < MAX_BAN_FILES; i++) { if (!_banFiles[i]) { - _banFiles[i] = loadFile(name + ".ban"); + _banFiles[i] = SharedPtr<Common::MemoryReadStreamEndian>(loadFile(name + ".ban")); _banFileOffsets[i] = 0; return; } @@ -435,7 +435,7 @@ void StarTrekEngine::drawActorToScreen(Actor *actor, const Common::String &_anim actor->animFilename = _animName; actor->animType = 2; - actor->animFile = loadFile(animFilename + ".anm"); + actor->animFile = SharedPtr<Common::MemoryReadStreamEndian>(loadFile(animFilename + ".anm")); actor->numAnimFrames = actor->animFile->size() / 22; actor->animFrame = 0; actor->pos.x = x; @@ -764,7 +764,7 @@ SharedPtr<Bitmap> StarTrekEngine::loadAnimationFrame(const Common::String &filen } // Redraw face with xor file - FileStream xorFile = loadFile(filename + ".xor"); + Common::MemoryReadStreamEndian *xorFile = loadFile(filename + ".xor"); xorFile->seek(0, SEEK_SET); uint16 xoffset = bitmap->xoffset - xorFile->readUint16(); uint16 yoffset = bitmap->yoffset - xorFile->readUint16(); @@ -778,6 +778,8 @@ SharedPtr<Bitmap> StarTrekEngine::loadAnimationFrame(const Common::String &filen *dest++ ^= xorFile->readByte(); dest += (bitmap->width - xorWidth); } + + delete xorFile; } } } else { |