diff options
Diffstat (limited to 'engines/sword25')
| -rw-r--r-- | engines/sword25/gfx/graphicengine.h | 4 | ||||
| -rw-r--r-- | engines/sword25/gfx/image/pngloader.cpp | 1 | ||||
| -rw-r--r-- | engines/sword25/gfx/screenshot.cpp | 7 | ||||
| -rw-r--r-- | engines/sword25/gfx/screenshot.h | 2 | ||||
| -rw-r--r-- | engines/sword25/kernel/persistenceservice.cpp | 2 |
5 files changed, 8 insertions, 8 deletions
diff --git a/engines/sword25/gfx/graphicengine.h b/engines/sword25/gfx/graphicengine.h index 3f3e111f74..ccfa2ed363 100644 --- a/engines/sword25/gfx/graphicengine.h +++ b/engines/sword25/gfx/graphicengine.h @@ -281,8 +281,8 @@ public: Graphics::Surface _frameBuffer; Graphics::Surface *getFrameBuffer() { return &_frameBuffer; } - Common::MemoryReadStream *_thumbnail; - Common::MemoryReadStream *getThumbnail() { return _thumbnail; } + Common::SeekableReadStream *_thumbnail; + Common::SeekableReadStream *getThumbnail() { return _thumbnail; } // Access methods diff --git a/engines/sword25/gfx/image/pngloader.cpp b/engines/sword25/gfx/image/pngloader.cpp index 1b72595a8f..581d5fd917 100644 --- a/engines/sword25/gfx/image/pngloader.cpp +++ b/engines/sword25/gfx/image/pngloader.cpp @@ -35,6 +35,7 @@ // Disable symbol overrides so that we can use png.h #define FORBIDDEN_SYMBOL_ALLOW_ALL +#include "common/memstream.h" #include "sword25/gfx/image/image.h" #include "sword25/gfx/image/pngloader.h" #include <png.h> diff --git a/engines/sword25/gfx/screenshot.cpp b/engines/sword25/gfx/screenshot.cpp index 3dc88237f9..b7bb31c8e4 100644 --- a/engines/sword25/gfx/screenshot.cpp +++ b/engines/sword25/gfx/screenshot.cpp @@ -37,8 +37,7 @@ #define BS_LOG_PREFIX "SCREENSHOT" -#include "common/system.h" -#include "common/savefile.h" +#include "common/memstream.h" #include "sword25/gfx/screenshot.h" #include "sword25/kernel/filesystemutil.h" #include <png.h> @@ -123,7 +122,7 @@ bool Screenshot::saveToFile(Graphics::Surface *data, Common::WriteStream *stream // ----------------------------------------------------------------------------- -Common::MemoryReadStream *Screenshot::createThumbnail(Graphics::Surface *data) { +Common::SeekableReadStream *Screenshot::createThumbnail(Graphics::Surface *data) { // This method takes a screen image with a dimension of 800x600, and creates a screenshot with a dimension of 200x125. // First 50 pixels are cut off the top and bottom (the interface boards in the game). The remaining image of 800x500 // will be on a 16th of its size, reduced by being handed out in 4x4 pixel blocks and the average of each block @@ -177,7 +176,7 @@ Common::MemoryReadStream *Screenshot::createThumbnail(Graphics::Surface *data) { saveToFile(&thumbnail, stream); // Output a MemoryReadStream that encompasses the written data - Common::MemoryReadStream *result = new Common::MemoryReadStream(stream->getData(), stream->size(), + Common::SeekableReadStream *result = new Common::MemoryReadStream(stream->getData(), stream->size(), DisposeAfterUse::YES); return result; } diff --git a/engines/sword25/gfx/screenshot.h b/engines/sword25/gfx/screenshot.h index eefaa1bca6..a0f615f9e6 100644 --- a/engines/sword25/gfx/screenshot.h +++ b/engines/sword25/gfx/screenshot.h @@ -43,7 +43,7 @@ namespace Sword25 { class Screenshot { public: static bool saveToFile(Graphics::Surface *data, Common::WriteStream *stream); - static Common::MemoryReadStream *createThumbnail(Graphics::Surface *data); + static Common::SeekableReadStream *createThumbnail(Graphics::Surface *data); }; } // End of namespace Sword25 diff --git a/engines/sword25/kernel/persistenceservice.cpp b/engines/sword25/kernel/persistenceservice.cpp index 564f031cf3..0508f2be8f 100644 --- a/engines/sword25/kernel/persistenceservice.cpp +++ b/engines/sword25/kernel/persistenceservice.cpp @@ -316,7 +316,7 @@ bool PersistenceService::saveGame(uint slotID, const Common::String &screenshotF } // Get the screenshot - Common::MemoryReadStream *thumbnail = Kernel::getInstance()->getGfx()->getThumbnail(); + Common::SeekableReadStream *thumbnail = Kernel::getInstance()->getGfx()->getThumbnail(); if (thumbnail) { byte *buffer = new Byte[FILE_COPY_BUFFER_SIZE]; |