aboutsummaryrefslogtreecommitdiff
path: root/engines/startrek/actors.cpp
diff options
context:
space:
mode:
authorFilippos Karapetis2019-06-10 01:16:48 +0300
committerFilippos Karapetis2019-06-11 00:48:15 +0300
commit3f7f1a24108b1333908e82fd01455ea4f863afd3 (patch)
treee8bc7506632e942dacb29b18afbaa1a9705bdb60 /engines/startrek/actors.cpp
parent9ba6b79e1a0bd48fe69879a145c63296e631cf5f (diff)
downloadscummvm-rg350-3f7f1a24108b1333908e82fd01455ea4f863afd3.tar.gz
scummvm-rg350-3f7f1a24108b1333908e82fd01455ea4f863afd3.tar.bz2
scummvm-rg350-3f7f1a24108b1333908e82fd01455ea4f863afd3.zip
STARTREK: Remove the FileStream wrapper class
Diffstat (limited to 'engines/startrek/actors.cpp')
-rw-r--r--engines/startrek/actors.cpp7
1 files changed, 5 insertions, 2 deletions
diff --git a/engines/startrek/actors.cpp b/engines/startrek/actors.cpp
index b2912497d2..1e0d8b6d2a 100644
--- a/engines/startrek/actors.cpp
+++ b/engines/startrek/actors.cpp
@@ -20,6 +20,9 @@
*
*/
+#include "common/stream.h"
+#include "common/memstream.h"
+
#include "startrek/iwfile.h"
#include "startrek/room.h"
#include "startrek/startrek.h"
@@ -278,7 +281,7 @@ void StarTrekEngine::renderBanBelowSprites() {
_gfx->unlockScreenPixels();
}
-void StarTrekEngine::renderBan(byte *destPixels, SharedPtr<FileStream> banFile) {
+void StarTrekEngine::renderBan(byte *destPixels, FileStream banFile) {
uint16 offset = banFile->readUint16();
int32 size = banFile->readUint16();
@@ -761,7 +764,7 @@ SharedPtr<Bitmap> StarTrekEngine::loadAnimationFrame(const Common::String &filen
}
// Redraw face with xor file
- SharedPtr<FileStream> xorFile = loadFile(filename + ".xor");
+ FileStream xorFile = loadFile(filename + ".xor");
xorFile->seek(0, SEEK_SET);
uint16 xoffset = bitmap->xoffset - xorFile->readUint16();
uint16 yoffset = bitmap->yoffset - xorFile->readUint16();