diff options
| author | jacob1 <jfu614@gmail.com> | 2012-10-19 23:17:15 (GMT) |
|---|---|---|
| committer | Simon Robertshaw <simon@hardwired.org.uk> | 2012-10-26 14:15:38 (GMT) |
| commit | 3a29fc0268dbda68e80f7de586c6692ba7a11565 (patch) | |
| tree | fa2ae1ded7149c2b56c4dcecac032e991b30d00e /src/client | |
| parent | e2622657f076ef943d051593d0969306daf15f32 (diff) | |
| download | powder-3a29fc0268dbda68e80f7de586c6692ba7a11565.zip powder-3a29fc0268dbda68e80f7de586c6692ba7a11565.tar.gz | |
Save local saves as current name option (overwrites them automatically). Fix filename not showing when first saving a local save
Diffstat (limited to 'src/client')
| -rw-r--r-- | src/client/Client.cpp | 22 | ||||
| -rw-r--r-- | src/client/Client.h | 1 | ||||
| -rw-r--r-- | src/client/SaveFile.cpp | 5 | ||||
| -rw-r--r-- | src/client/SaveFile.h | 1 |
4 files changed, 18 insertions, 11 deletions
diff --git a/src/client/Client.cpp b/src/client/Client.cpp index b35c292..763814a 100644 --- a/src/client/Client.cpp +++ b/src/client/Client.cpp @@ -430,6 +430,15 @@ std::vector<std::string> Client::DirectorySearch(std::string directory, std::str return searchResults; } +int Client::MakeDirectory(const char * dirName) +{ +#ifdef WIN + return _mkdir(dirName); +#else + return mkdir(dirName, 0755); +#endif +} + void Client::WriteFile(std::vector<unsigned char> fileData, std::string filename) { try @@ -870,11 +879,7 @@ std::string Client::AddStamp(GameSave * saveData) << std::setw(8) << std::setfill('0') << std::hex << lastStampTime << std::setw(2) << std::setfill('0') << std::hex << lastStampName; -#ifdef WIN - _mkdir(STAMPS_DIR); -#else - mkdir(STAMPS_DIR, 0755); -#endif + MakeDirectory(STAMPS_DIR); int gameDataLength; char * gameData = saveData->Serialise(gameDataLength); @@ -895,12 +900,7 @@ std::string Client::AddStamp(GameSave * saveData) void Client::updateStamps() { - -#ifdef WIN - _mkdir(STAMPS_DIR); -#else - mkdir(STAMPS_DIR, 0755); -#endif + MakeDirectory(STAMPS_DIR); std::ofstream stampsStream; stampsStream.open(std::string(STAMPS_DIR PATH_SEP "stamps.def").c_str(), std::ios::binary); diff --git a/src/client/Client.h b/src/client/Client.h index 4f65788..642fd63 100644 --- a/src/client/Client.h +++ b/src/client/Client.h @@ -98,6 +98,7 @@ public: void Initialise(std::string proxyString); void SetProxy(std::string proxy); + int MakeDirectory(const char * dirname); void WriteFile(std::vector<unsigned char> fileData, std::string filename); void WriteFile(std::vector<char> fileData, std::string filename); bool FileExists(std::string filename); diff --git a/src/client/SaveFile.cpp b/src/client/SaveFile.cpp index 368d89d..fe7ad4f 100644 --- a/src/client/SaveFile.cpp +++ b/src/client/SaveFile.cpp @@ -56,6 +56,11 @@ std::string SaveFile::GetName() return filename; } +void SaveFile::SetFileName(std::string fileName) +{ + this->filename = fileName; +} + std::string SaveFile::GetDisplayName() { return displayName; diff --git a/src/client/SaveFile.h b/src/client/SaveFile.h index 9a9310f..b63d181 100644 --- a/src/client/SaveFile.h +++ b/src/client/SaveFile.h @@ -25,6 +25,7 @@ public: std::string GetDisplayName(); void SetDisplayName(std::string displayName); std::string GetName(); + void SetFileName(std::string fileName); virtual ~SaveFile(); private: |
