4 files changed, 13 insertions, 2 deletions
diff --git a/engines/zvision/console.cpp b/engines/zvision/console.cpp
index ed244c1f58..2b45ed24b9 100644
--- a/engines/zvision/console.cpp
+++ b/engines/zvision/console.cpp
@@ -29,6 +29,7 @@
 
 #include "zvision/console.h"
 #include "zvision/zvision.h"
+#include "zvision/render_manager.h"
 #include "zvision/zork_avi_decoder.h"
 #include "zvision/zork_raw.h"
 #include "zvision/utility.h"
@@ -47,7 +48,7 @@ bool Console::cmdLoadImage(int argc, const char **argv) {
 		DebugPrintf("Use loadimage <fileName> <x> <y> to load an image to the screen\n");
 		return true;
 	}
-	_engine->renderImageToScreen(argv[1], atoi(argv[2]), atoi(argv[3]));
+	_engine->getRenderManager()->renderImageToScreen(argv[1], atoi(argv[2]), atoi(argv[3]));
 
 	return true;
 }
diff --git a/engines/zvision/console.h b/engines/zvision/console.h
index 3110d8ad37..05b8f1247f 100644
--- a/engines/zvision/console.h
+++ b/engines/zvision/console.h
@@ -40,6 +40,7 @@ private:
 	bool cmdLoadImage(int argc, const char **argv);
 	bool cmdLoadVideo(int argc, const char **argv);
 	bool cmdLoadSound(int argc, const char **argv);
+	bool cmdRawToWav(int argc, const char **argv);
 };
 
 } // End of namespace ZVision
diff --git a/engines/zvision/zvision.cpp b/engines/zvision/zvision.cpp
index 4ce775db86..0e2e02788f 100644
--- a/engines/zvision/zvision.cpp
+++ b/engines/zvision/zvision.cpp
@@ -35,6 +35,7 @@
 #include "zvision/zvision.h"
 #include "zvision/console.h"
 #include "zvision/script_manager.h"
+#include "zvision/render_manager.h"
 #include "zvision/zfs_archive.h"
 #include "zvision/detection.h"
 
@@ -73,6 +74,7 @@ ZVision::ZVision(OSystem *syst, const ZVisionGameDescription *gameDesc)
 
 	// Create managers
 	_scriptManager = new ScriptManager(this);
+	_renderManager = new RenderManager(_system);
 
 	debug("ZVision::ZVision");
 }
@@ -151,6 +153,10 @@ ScriptManager *ZVision::getScriptManager() const {
 	return _scriptManager;
 }
 
+RenderManager *ZVision::getRenderManager() const {
+	return _renderManager;
+}
+
 Common::RandomSource *ZVision::getRandomSource() const {
 	return _rnd;
 }
diff --git a/engines/zvision/zvision.h b/engines/zvision/zvision.h
index 17a7c026f1..7740dba6dc 100644
--- a/engines/zvision/zvision.h
+++ b/engines/zvision/zvision.h
@@ -40,6 +40,7 @@ namespace ZVision {
 struct ZVisionGameDescription;
 class Console;
 class ScriptManager;
+class RenderManager;
  
 // our engine debug channels
 enum {
@@ -65,6 +66,8 @@ private:
 	Common::RandomSource *_rnd;
 	// Managers
 	ScriptManager *_scriptManager;
+	RenderManager *_renderManager;
+
 	// To prevent allocation every time we process events
 	Common::Event _event;
 
@@ -77,10 +80,10 @@ public:
 	Common::Language getLanguage() const;
 	virtual Common::Error run();
 	ScriptManager *getScriptManager() const;
+	RenderManager *getRenderManager() const;
 	Common::RandomSource *getRandomSource() const;
 	ZVisionGameId getGameId() const;
 
-	void renderImageToScreen(const Common::String &fileName, uint32 x, uint32 y);
 	void startVideo(Video::VideoDecoder *videoDecoder);
 	void continueVideo();