diff options
| author | Filippos Karapetis | 2019-06-10 01:16:48 +0300 |
|---|---|---|
| committer | Filippos Karapetis | 2019-06-11 00:48:15 +0300 |
| commit | 3f7f1a24108b1333908e82fd01455ea4f863afd3 (patch) | |
| tree | e8bc7506632e942dacb29b18afbaa1a9705bdb60 /engines/startrek/bitmap.h | |
| parent | 9ba6b79e1a0bd48fe69879a145c63296e631cf5f (diff) | |
| download | scummvm-rg350-3f7f1a24108b1333908e82fd01455ea4f863afd3.tar.gz scummvm-rg350-3f7f1a24108b1333908e82fd01455ea4f863afd3.tar.bz2 scummvm-rg350-3f7f1a24108b1333908e82fd01455ea4f863afd3.zip | |
STARTREK: Remove the FileStream wrapper class
Diffstat (limited to 'engines/startrek/bitmap.h')
| -rw-r--r-- | engines/startrek/bitmap.h | 8 |
1 files changed, 5 insertions, 3 deletions
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(); |