diff options
| author | Marisa-Chan | 2014-06-14 15:18:24 +0700 |
|---|---|---|
| committer | Marisa-Chan | 2014-06-14 15:18:24 +0700 |
| commit | ace0e5e88f63f34dad94962c95f57f3ec42258ae (patch) | |
| tree | 7d4559ca617c31774ef42afabc14094a56512d4c /engines/zvision/graphics | |
| parent | 45589950c0fb1a449351e6a00ef10d42290d8bae (diff) | |
| download | scummvm-rg350-ace0e5e88f63f34dad94962c95f57f3ec42258ae.tar.gz scummvm-rg350-ace0e5e88f63f34dad94962c95f57f3ec42258ae.tar.bz2 scummvm-rg350-ace0e5e88f63f34dad94962c95f57f3ec42258ae.zip | |
ZVISION: Fix compilation errors with latest scummvm
Diffstat (limited to 'engines/zvision/graphics')
| -rw-r--r-- | engines/zvision/graphics/render_manager.cpp | 10 | ||||
| -rw-r--r-- | engines/zvision/graphics/render_manager.h | 4 |
2 files changed, 7 insertions, 7 deletions
diff --git a/engines/zvision/graphics/render_manager.cpp b/engines/zvision/graphics/render_manager.cpp index 071affffab..c9dc5d37b2 100644 --- a/engines/zvision/graphics/render_manager.cpp +++ b/engines/zvision/graphics/render_manager.cpp @@ -23,10 +23,10 @@ #include "common/scummsys.h" #include "zvision/zvision.h" -#include "zvision/render_manager.h" +#include "zvision/graphics/render_manager.h" #include "zvision/text.h" -#include "zvision/lzss_read_stream.h" +#include "zvision/utility/lzss_read_stream.h" #include "common/file.h" #include "common/system.h" @@ -34,7 +34,7 @@ #include "engines/util.h" -#include "graphics/decoders/tga.h" +#include "image/tga.h" namespace ZVision { @@ -127,7 +127,7 @@ void RenderManager::readImageToSurface(const Common::String &fileName, Graphics: uint32 imageWidth; uint32 imageHeight; - Graphics::TGADecoder tga; + Image::TGADecoder tga; uint16 *buffer; bool isTransposed = _renderTable.getRenderState() == RenderTable::PANORAMA; // All ZVision images are in RGB 555 @@ -221,7 +221,7 @@ void RenderManager::readImageToSurface(const Common::String &fileName, Graphics: uint32 imageWidth; uint32 imageHeight; - Graphics::TGADecoder tga; + Image::TGADecoder tga; uint16 *buffer; // All ZVision images are in RGB 555 Graphics::PixelFormat pixelFormat555 = Graphics::PixelFormat(2, 5, 5, 5, 0, 10, 5, 0, 0); diff --git a/engines/zvision/graphics/render_manager.h b/engines/zvision/graphics/render_manager.h index 668c8acc41..ca2e715e8a 100644 --- a/engines/zvision/graphics/render_manager.h +++ b/engines/zvision/graphics/render_manager.h @@ -23,8 +23,8 @@ #ifndef ZVISION_RENDER_MANAGER_H #define ZVISION_RENDER_MANAGER_H -#include "zvision/render_table.h" -#include "zvision/truetype_font.h" +#include "zvision/graphics/render_table.h" +#include "zvision/fonts/truetype_font.h" #include "common/rect.h" #include "common/hashmap.h" |