From 4d0ebfaa2285e2741a134db36fb4f5bd0317784d Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Fri, 26 Dec 2014 04:03:20 +0200
Subject: ZVISION: Move the save manager together with the other file classes

---
 engines/zvision/scripting/controls/save_control.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'engines/zvision/scripting/controls/save_control.cpp')

diff --git a/engines/zvision/scripting/controls/save_control.cpp b/engines/zvision/scripting/controls/save_control.cpp
index b35611feca..3a4dc47fe8 100644
--- a/engines/zvision/scripting/controls/save_control.cpp
+++ b/engines/zvision/scripting/controls/save_control.cpp
@@ -29,7 +29,7 @@
 #include "zvision/scripting/script_manager.h"
 #include "zvision/text/string_manager.h"
 
-#include "zvision/core/save_manager.h"
+#include "zvision/file/save_manager.h"
 
 #include "common/str.h"
 #include "common/stream.h"
-- 
cgit v1.2.3


From 5a72eea2bb102bafb6da112ea90ad1f4af11e1f2 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Fri, 26 Dec 2014 12:41:36 +0200
Subject: ZVISION: Move some event/rendering code out of the main engine code

---
 engines/zvision/scripting/controls/save_control.cpp | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'engines/zvision/scripting/controls/save_control.cpp')

diff --git a/engines/zvision/scripting/controls/save_control.cpp b/engines/zvision/scripting/controls/save_control.cpp
index 3a4dc47fe8..6cedddffeb 100644
--- a/engines/zvision/scripting/controls/save_control.cpp
+++ b/engines/zvision/scripting/controls/save_control.cpp
@@ -30,6 +30,7 @@
 #include "zvision/text/string_manager.h"
 
 #include "zvision/file/save_manager.h"
+#include "zvision/graphics/render_manager.h"
 
 #include "common/str.h"
 #include "common/stream.h"
@@ -97,18 +98,18 @@ bool SaveControl::process(uint32 deltaTimeInMillis) {
 					if (inp->getText().size() > 0) {
 						bool toSave = true;
 						if (iter->exist)
-							if (!_engine->askQuestion(_engine->getStringManager()->getTextLine(StringManager::ZVISION_STR_SAVEEXIST)))
+							if (!_engine->getRenderManager()->askQuestion(_engine->getStringManager()->getTextLine(StringManager::ZVISION_STR_SAVEEXIST)))
 								toSave = false;
 
 						if (toSave) {
 							// FIXME: At this point, the screen shows the save control, so the save game thumbnails will always
 							// show the save control
 							_engine->getSaveManager()->saveGameBuffered(iter->saveId, inp->getText());
-							_engine->delayedMessage(_engine->getStringManager()->getTextLine(StringManager::ZVISION_STR_SAVED), 2000);
+							_engine->getRenderManager()->delayedMessage(_engine->getStringManager()->getTextLine(StringManager::ZVISION_STR_SAVED), 2000);
 							_engine->getScriptManager()->changeLocation(_engine->getScriptManager()->getLastMenuLocation());
 						}
 					} else {
-						_engine->timedMessage(_engine->getStringManager()->getTextLine(StringManager::ZVISION_STR_SAVEEMPTY), 2000);
+						_engine->getRenderManager()->timedMessage(_engine->getStringManager()->getTextLine(StringManager::ZVISION_STR_SAVEEMPTY), 2000);
 					}
 				} else {
 					_engine->getSaveManager()->loadGame(iter->saveId);
-- 
cgit v1.2.3


From 79b92fe04698d3336f1d5232d4701133ff3ac10c Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Fri, 9 Jan 2015 01:09:53 +0200
Subject: ZVISION: Clean up save logic, and fix a thumbnail-related FIXME

This fixes the save game thumbnails when using the original save/load
screens
---
 engines/zvision/scripting/controls/save_control.cpp | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'engines/zvision/scripting/controls/save_control.cpp')

diff --git a/engines/zvision/scripting/controls/save_control.cpp b/engines/zvision/scripting/controls/save_control.cpp
index 6cedddffeb..2ac77c4776 100644
--- a/engines/zvision/scripting/controls/save_control.cpp
+++ b/engines/zvision/scripting/controls/save_control.cpp
@@ -102,9 +102,7 @@ bool SaveControl::process(uint32 deltaTimeInMillis) {
 								toSave = false;
 
 						if (toSave) {
-							// FIXME: At this point, the screen shows the save control, so the save game thumbnails will always
-							// show the save control
-							_engine->getSaveManager()->saveGameBuffered(iter->saveId, inp->getText());
+							_engine->getSaveManager()->saveGame(iter->saveId, inp->getText(), true);
 							_engine->getRenderManager()->delayedMessage(_engine->getStringManager()->getTextLine(StringManager::ZVISION_STR_SAVED), 2000);
 							_engine->getScriptManager()->changeLocation(_engine->getScriptManager()->getLastMenuLocation());
 						}
-- 
cgit v1.2.3