From 3f7f1a24108b1333908e82fd01455ea4f863afd3 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Mon, 10 Jun 2019 01:16:48 +0300
Subject: STARTREK: Remove the FileStream wrapper class

---
 engines/startrek/bitmap.h | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'engines/startrek/bitmap.h')

diff --git a/engines/startrek/bitmap.h b/engines/startrek/bitmap.h
index 746562df49..8178f54e1a 100644
--- a/engines/startrek/bitmap.h
+++ b/engines/startrek/bitmap.h
@@ -23,13 +23,15 @@
 #ifndef STARTREK_BITMAP_H
 #define STARTREK_BITMAP_H
 
-#include "startrek/filestream.h"
-
 #include "common/ptr.h"
 #include "common/stream.h"
+#include "common/memstream.h"
 
 namespace StarTrek {
 
+// FIXME: Eventually get rid of Common::SharedPtr and dispose of file streams properly
+typedef Common::SharedPtr<Common::MemoryReadStreamEndian> FileStream;
+
 struct Bitmap {
 	int16 xoffset;
 	int16 yoffset;
@@ -37,7 +39,7 @@ struct Bitmap {
 	int16 height;
 	byte *pixels;
 
-	Bitmap(Common::SharedPtr<FileStream> stream);
+	Bitmap(FileStream stream);
 	Bitmap(const Bitmap &bitmap);
 	Bitmap(int w, int h);
 	~Bitmap();
-- 
cgit v1.2.3