diff options
author | Borja Lorente | 2016-07-29 10:26:51 +0200 |
---|---|---|
committer | Borja Lorente | 2016-07-31 14:47:22 +0200 |
commit | 2b586e7c5959c839323d24d1f788c9a836ece765 (patch) | |
tree | 8e21b6efff00d4ea427cba05bc377e4b04e8e3fd /engines/wage | |
parent | 3b1ba50c88931074184b63bc919cdaa47a749283 (diff) | |
download | scummvm-rg350-2b586e7c5959c839323d24d1f788c9a836ece765.tar.gz scummvm-rg350-2b586e7c5959c839323d24d1f788c9a836ece765.tar.bz2 scummvm-rg350-2b586e7c5959c839323d24d1f788c9a836ece765.zip |
WAGE: Fallback to built-in borders
Diffstat (limited to 'engines/wage')
-rw-r--r-- | engines/wage/gui.cpp | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/engines/wage/gui.cpp b/engines/wage/gui.cpp index 6907679be4..a60395fb69 100644 --- a/engines/wage/gui.cpp +++ b/engines/wage/gui.cpp @@ -382,20 +382,9 @@ void Gui::loadBorder(Graphics::MacWindow *target, Common::String filename, bool Image::BitmapDecoder bmpDecoder; Common::SeekableReadStream *stream = borderfile.readStream(borderfile.size()); - Graphics::Surface source; - Graphics::TransparentSurface *surface = new Graphics::TransparentSurface(); - if (stream) { - debug(4, "Loading %s border from %s", (active ? "active" : "inactive"), filename); - bmpDecoder.loadStream(*stream); - source = *(bmpDecoder.getSurface()); - - source.convertToInPlace(surface->getSupportedPixelFormat(), bmpDecoder.getPalette()); - surface->create(source.w, source.h, source.format); - surface->copyFrom(source); - surface->applyColorKey(255, 0, 255, false); - target->setBorder(*surface, active, 10, 10, 1, 1); + target->loadBorder(*stream, active, 10, 10, 1, 1); borderfile.close(); |