From 0ae3cbc2e8dca79ee75f235469ed26715efb0ace Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Sat, 28 Dec 2019 13:21:23 +0200
Subject: STARTREK: Reduce usage of SharedPtr, and simplify bitmap related
 calls

---
 engines/startrek/bitmap.h | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

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

diff --git a/engines/startrek/bitmap.h b/engines/startrek/bitmap.h
index 6385d191fa..6eef47622b 100644
--- a/engines/startrek/bitmap.h
+++ b/engines/startrek/bitmap.h
@@ -29,9 +29,6 @@
 
 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;
@@ -39,8 +36,7 @@ struct Bitmap {
 	int16 height;
 	byte *pixels;
 
-	Bitmap(FileStream stream);
-	Bitmap(Common::MemoryReadStreamEndian *stream);
+	Bitmap(Common::MemoryReadStreamEndian *stream, bool closeStream = true);
 	Bitmap(const Bitmap &bitmap);
 	Bitmap(int w, int h);
 	~Bitmap();
-- 
cgit v1.2.3