diff options
| author | Filippos Karapetis | 2019-12-28 13:21:23 +0200 |
|---|---|---|
| committer | Filippos Karapetis | 2019-12-28 13:22:18 +0200 |
| commit | 0ae3cbc2e8dca79ee75f235469ed26715efb0ace (patch) | |
| tree | 4cc9cde49f83366d3486ee2d7deb3160c9ba7221 /engines/startrek/bitmap.h | |
| parent | 9cbedc03f9b9e9e44abc457e60ade4b9d14f8938 (diff) | |
| download | scummvm-rg350-0ae3cbc2e8dca79ee75f235469ed26715efb0ace.tar.gz scummvm-rg350-0ae3cbc2e8dca79ee75f235469ed26715efb0ace.tar.bz2 scummvm-rg350-0ae3cbc2e8dca79ee75f235469ed26715efb0ace.zip | |
STARTREK: Reduce usage of SharedPtr, and simplify bitmap related calls
Diffstat (limited to 'engines/startrek/bitmap.h')
| -rw-r--r-- | engines/startrek/bitmap.h | 6 |
1 files changed, 1 insertions, 5 deletions
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(); |