games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-01-12 02:28:11 +02:00
Code Issues Releases Activity

fixes #1237 - if server savegame entry is missing it will be created in "update mode".

Browse Source
This commit is contained in:
Ivan Savenko 2013-05-30 16:25:00 +00:00
parent 1e8e932323
commit 3943c10f1a
6 changed files with 28 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
client/Client.cpp
View File

@ -230,8 +230,18 @@ void CClient::loadGame( const std::string & fname )
CStopWatch tmh;
try
{
auto clientSaveName = CResourceHandler::get()->getResourceName(ResourceID(fname, EResType::CLIENT_SAVEGAME));
auto controlServerSaveName = CResourceHandler::get()->getResourceName(ResourceID(fname, EResType::SERVER_SAVEGAME));
std::string clientSaveName = CResourceHandler::get()->getResourceName(ResourceID(fname, EResType::CLIENT_SAVEGAME));
std::string controlServerSaveName;
if (CResourceHandler::get()->existsResource(ResourceID(fname, EResType::SERVER_SAVEGAME)))
{
controlServerSaveName = CResourceHandler::get()->getResourceName(ResourceID(fname, EResType::SERVER_SAVEGAME));
}
else// create entry for server savegame. Triggered if save was made after launch and not yet present in res handler
{
controlServerSaveName = clientSaveName.substr(0, clientSaveName.find_last_of(".")) + ".vsgm1";
CResourceHandler::get()->createResource(controlServerSaveName, true);
}
if(clientSaveName.empty())
throw std::runtime_error("Cannot open client part of " + fname);

5
lib/filesystem/CFilesystemLoader.cpp
View File

@ -39,14 +39,15 @@ std::string CFilesystemLoader::getOrigin() const
return baseDirectory;
}
bool CFilesystemLoader::createEntry(std::string filename)
bool CFilesystemLoader::createEntry(std::string filename, bool update)
{
ResourceID res(filename);
if (fileList.find(res) != fileList.end())
return false;
fileList[res] = filename;
std::ofstream newfile (baseDirectory + "/" + filename);
if (!update)
std::ofstream newfile (baseDirectory + "/" + filename);
return true;
}

2
lib/filesystem/CFilesystemLoader.h
View File

@ -39,7 +39,7 @@ public:
bool existsEntry(const std::string & resourceName) const override;
boost::unordered_map<ResourceID, std::string> getEntries() const override;
std::string getOrigin() const override;
bool createEntry(std::string filename) override;
bool createEntry(std::string filename, bool update) override;
private:
/** The base directory which is scanned and indexed. */

11
lib/filesystem/CResourceLoader.cpp
View File

@ -137,7 +137,7 @@ bool CResourceLoader::existsResource(const ResourceID & resourceIdent) const
return resources.find(resourceIdent) != resources.end();
}
bool CResourceLoader::createResource(std::string URI)
bool CResourceLoader::createResource(std::string URI, bool update)
{
std::string filename = URI;
boost::to_upper(URI);
@ -148,9 +148,16 @@ bool CResourceLoader::createResource(std::string URI)
// remove loader prefix from filename
filename = filename.substr(entry.prefix.size());
if (!entry.loader->createEntry(filename))
return false; //or continue loop?
continue;
resources[ResourceID(URI)].push_back(ResourceLocator(entry.loader.get(), filename));
// Check if resource was created successfully. Possible reasons for this to fail
// a) loader failed to create resource (e.g. read-only FS)
// b) in update mode, call with filename that does not exists
assert(load(ResourceID(URI)));
return true;
}
}
return false;

3
lib/filesystem/CResourceLoader.h
View File

@ -294,9 +294,10 @@ public:
* File case will be same as in URI
*
* @param URI file to create
* @param update if true - this file is already present but not yet known by res handler
* @return true on success, false if resource exists or on error
*/
bool createResource(std::string URI);
bool createResource(std::string URI, bool update = false);
/**
* Adds a simple resource loader to the loaders list and its entries to the resources list.

2
lib/filesystem/ISimpleResourceLoader.h
View File

@ -67,7 +67,7 @@ public:
*
* @returns true if new file was created, false on error or if file already exists
*/
virtual bool createEntry(std::string filename)
virtual bool createEntry(std::string filename, bool update = false)
{
return false;
}