[Scummvm-git-logs] scummvm master -> 8511d752472561c3f8c3946f9ded803040edd3a7

[dreammaster]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
8511d75247 NUVIE: Beginnings of method for transfer character


Commit: 8511d752472561c3f8c3946f9ded803040edd3a7
    https://github.com/scummvm/scummvm/commit/8511d752472561c3f8c3946f9ded803040edd3a7
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2020-02-12T20:38:03-08:00

Commit Message:
NUVIE: Beginnings of method for transfer character

Changed paths:
    engines/ultima/POTFILES
    engines/ultima/nuvie/save/save_game.cpp
    engines/ultima/nuvie/save/save_game.h


diff --git a/engines/ultima/POTFILES b/engines/ultima/POTFILES
index d4bc561..dd89637 100644
--- a/engines/ultima/POTFILES
+++ b/engines/ultima/POTFILES
@@ -1,3 +1,4 @@
 engines/ultima/shared/engine/ultima.cpp
 engines/ultima/shared/engine/data_archive.cpp
+engines/ultima/nuvie/save/save_game.cpp
 engines/ultima/ultima8/ultima8.cpp
diff --git a/engines/ultima/nuvie/save/save_game.cpp b/engines/ultima/nuvie/save/save_game.cpp
index 955419e..b36f0c3 100644
--- a/engines/ultima/nuvie/save/save_game.cpp
+++ b/engines/ultima/nuvie/save/save_game.cpp
@@ -49,6 +49,8 @@
 #include "ultima/nuvie/nuvie.h"
 #include "common/system.h"
 #include "common/savefile.h"
+#include "common/translation.h"
+#include "gui/browser.h"
 
 namespace Ultima {
 namespace Nuvie {
@@ -206,6 +208,18 @@ bool SaveGame::load_original() {
 	return true;
 }
 
+bool SaveGame::transfer_character() {
+	::GUI::BrowserDialog dialog(_("Transfer Character"), true);
+	if (!dialog.runModal())
+		return false;
+
+	Common::FSNode folder = dialog.getResult();
+
+	// TODO: Load in character data from given folder and start new game
+	g_engine->GUIError(Common::String::format("Load party file from folder - %s", folder.getPath().c_str()));
+
+	return false;
+}
 
 bool SaveGame::load_objlist() {
 	Game *game;
diff --git a/engines/ultima/nuvie/save/save_game.h b/engines/ultima/nuvie/save/save_game.h
index ce5c768..048c609 100644
--- a/engines/ultima/nuvie/save/save_game.h
+++ b/engines/ultima/nuvie/save/save_game.h
@@ -59,8 +59,24 @@ public:
 
 	void init(ObjManager *obj_manager);
 
+	/**
+	 * Sets up a new game
+	 */
 	bool load_new();
+
+	/**
+	 * Loads in the savegame created by the original Ultima 6
+	 */
 	bool load_original();
+
+	/**
+	 * Transfers in a character from a previous Ultima game
+	 */
+	bool transfer_character();
+
+	/**
+	 * Loads the savegame with the given name
+	 */
 	bool load(const Common::String &filename);
 
 	bool check_version(NuvieIOFileRead *loadfile, uint16 gameType);