From 16b27090b1c7dc11cdc199b1a98c0f2973db5f45 Mon Sep 17 00:00:00 2001
From: Einar Johan Trøan Sømåen
Date: Fri, 31 Aug 2012 13:49:38 +0200
Subject: WINTERMUTE: Update to use new TGA-decoder and new Video-system

---
 engines/wintermute/base/gfx/base_image.cpp                   | 4 ++--
 engines/wintermute/base/gfx/osystem/base_surface_osystem.cpp | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'engines/wintermute/base')

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"
-- 
cgit v1.2.3