diff options
| author | Einar Johan Trøan Sømåen | 2012-08-31 13:49:38 +0200 |
|---|---|---|
| committer | Einar Johan Trøan Sømåen | 2012-08-31 13:49:38 +0200 |
| commit | 16b27090b1c7dc11cdc199b1a98c0f2973db5f45 (patch) | |
| tree | 795fe24dc2097801bbb773a907fd465bc23e9499 /engines/wintermute/base | |
| parent | 3fe7f2cbe2b70eaa824b7159d94d40c2280006a3 (diff) | |
| download | scummvm-rg350-16b27090b1c7dc11cdc199b1a98c0f2973db5f45.tar.gz scummvm-rg350-16b27090b1c7dc11cdc199b1a98c0f2973db5f45.tar.bz2 scummvm-rg350-16b27090b1c7dc11cdc199b1a98c0f2973db5f45.zip | |
WINTERMUTE: Update to use new TGA-decoder and new Video-system
Diffstat (limited to 'engines/wintermute/base')
| -rw-r--r-- | engines/wintermute/base/gfx/base_image.cpp | 4 | ||||
| -rw-r--r-- | engines/wintermute/base/gfx/osystem/base_surface_osystem.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/engines/wintermute/base/gfx/base_image.cpp b/engines/wintermute/base/gfx/base_image.cpp index ec52e26c00..1184d2bbf7 100644 --- a/engines/wintermute/base/gfx/base_image.cpp +++ b/engines/wintermute/base/gfx/base_image.cpp @@ -32,8 +32,8 @@ #include "graphics/decoders/png.h"
#include "graphics/decoders/jpeg.h"
#include "graphics/decoders/bmp.h"
+#include "graphics/decoders/tga.h"
#include "graphics/surface.h"
-#include "engines/wintermute/graphics/tga.h"
#include "common/textconsole.h"
#include "common/stream.h"
#include "common/system.h"
@@ -69,7 +69,7 @@ bool BaseImage::loadFile(const Common::String &filename) { } else if (_filename.hasSuffix(".bmp")) {
_decoder = new Graphics::BitmapDecoder();
} else if (_filename.hasSuffix(".tga")) {
- _decoder = new Wintermute::TGA();
+ _decoder = new Graphics::TGADecoder();
} else if (_filename.hasSuffix(".jpg")) {
_decoder = new Graphics::JPEGDecoder();
} else {
diff --git a/engines/wintermute/base/gfx/osystem/base_surface_osystem.cpp b/engines/wintermute/base/gfx/osystem/base_surface_osystem.cpp index 5b0f7c94c3..f0ec41a265 100644 --- a/engines/wintermute/base/gfx/osystem/base_surface_osystem.cpp +++ b/engines/wintermute/base/gfx/osystem/base_surface_osystem.cpp @@ -36,8 +36,8 @@ #include "graphics/decoders/png.h"
#include "graphics/decoders/bmp.h"
#include "graphics/decoders/jpeg.h"
+#include "graphics/decoders/tga.h"
#include "engines/wintermute/graphics/transparent_surface.h"
-#include "engines/wintermute/graphics/tga.h"
#include "graphics/pixelformat.h"
#include "graphics/surface.h"
#include "common/stream.h"
|