WINTERMUTE: Hardcode the Game.SaveDirectory return value in-engine for now.

4 files changed, 1 insertions, 19 deletions

diff --git a/engines/wintermute/base/base_game.cpp b/engines/wintermute/base/base_game.cpp
index 3e6cb6e043..a7ea7fe95f 100644
--- a/engines/wintermute/base/base_game.cpp
+++ b/engines/wintermute/base/base_game.cpp
@@ -2604,7 +2604,7 @@ ScValue *BaseGame::scGetProperty(const char *name) {
 	// SaveDirectory (RO)

 	//////////////////////////////////////////////////////////////////////////

 	else if (strcmp(name, "SaveDirectory") == 0) {

-		AnsiString dataDir = getDataDir();

+		AnsiString dataDir = "saves/";	// TODO: This is just to avoid telling the engine actual paths.

 		_scValue->setString(dataDir.c_str());

 		return _scValue;

 	}

@@ -4013,14 +4013,6 @@ bool BaseGame::getSaveSlotFilename(int slot, char *buffer) {
 }

 

 //////////////////////////////////////////////////////////////////////////

-AnsiString BaseGame::getDataDir() {

-	AnsiString userDir = PathUtil::getUserDirectory();

-	AnsiString baseDir = _registry->getBasePath();

-	return PathUtil::combine(userDir, baseDir);

-}

-

-

-//////////////////////////////////////////////////////////////////////////

 bool BaseGame::getSaveSlotDescription(int slot, char *buffer) {

 	buffer[0] = '\0';

 

diff --git a/engines/wintermute/base/base_game.h b/engines/wintermute/base/base_game.h
index 76881eefd7..9adca0743c 100644
--- a/engines/wintermute/base/base_game.h
+++ b/engines/wintermute/base/base_game.h
@@ -254,7 +254,6 @@ public:
 

 	virtual bool initAfterLoad();

 	BaseSaveThumbHelper *_cachedThumbnail;

-	AnsiString getDataDir();

 	void addMem(int bytes);

 	bool _touchInterface;

 	bool _constrainedMemory;

diff --git a/engines/wintermute/utils/path_util.cpp b/engines/wintermute/utils/path_util.cpp
index db1b479dab..065e0aada9 100644
--- a/engines/wintermute/utils/path_util.cpp
+++ b/engines/wintermute/utils/path_util.cpp
@@ -99,11 +99,4 @@ AnsiString PathUtil::getExtension(const AnsiString &path) {
 	return Common::lastPathComponent(path, '.');

 }

 

-//////////////////////////////////////////////////////////////////////////

-AnsiString PathUtil::getUserDirectory() { // TODO: Get rid of

-	warning("PathUtil::GetUserDirectory - stubbed");

-	AnsiString userDir = "./";

-	return userDir;

-}

-

 } // end of namespace WinterMute

diff --git a/engines/wintermute/utils/path_util.h b/engines/wintermute/utils/path_util.h
index 9b3e988805..f63c15dcd1 100644
--- a/engines/wintermute/utils/path_util.h
+++ b/engines/wintermute/utils/path_util.h
@@ -42,8 +42,6 @@ public:
 	static AnsiString getFileName(const AnsiString &path);

 	static AnsiString getFileNameWithoutExtension(const AnsiString &path);

 	static AnsiString getExtension(const AnsiString &path);

-

-	static AnsiString getUserDirectory();

 };

 

 } // end of namespace WinterMute