games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-03-31 22:05:10 +02:00
Code Issues Releases Activity

Merge pull request #2496 from IvanSavenko/saves_in_mods

Browse Source 
Allowed loading saves from inside mods
This commit is contained in:
Ivan Savenko 2023-08-12 11:27:15 +03:00 committed by GitHub
commit 8cbc52364a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
client/Client.cpp
View File

@ -219,7 +219,7 @@ void CClient::loadGame(CGameState * initializedGameState)
// try to deserialize client data including sleepingHeroes // try to deserialize client data including sleepingHeroes
try try
{ {
boost::filesystem::path clientSaveName = *CResourceHandler::get("local")->getResourceName(ResourceID(CSH->si->mapname, EResType::CLIENT_SAVEGAME)); boost::filesystem::path clientSaveName = *CResourceHandler::get()->getResourceName(ResourceID(CSH->si->mapname, EResType::CLIENT_SAVEGAME));
if(clientSaveName.empty()) if(clientSaveName.empty())
throw std::runtime_error("Cannot open client part of " + CSH->si->mapname); throw std::runtime_error("Cannot open client part of " + CSH->si->mapname);

2
client/lobby/SelectionTab.cpp
View File

@ -426,7 +426,7 @@ void SelectionTab::select(int position)
if(inputName && inputName->isActive()) if(inputName && inputName->isActive())
{ {
auto filename = *CResourceHandler::get("local")->getResourceName(ResourceID(curItems[py]->fileURI, EResType::SAVEGAME)); auto filename = *CResourceHandler::get()->getResourceName(ResourceID(curItems[py]->fileURI, EResType::SAVEGAME));
inputName->setText(filename.stem().string()); inputName->setText(filename.stem().string());
} }

2
server/CGameHandler.cpp
View File

@ -2944,7 +2944,7 @@ bool CGameHandler::load(const std::string & filename)
try try
{ {
{ {
CLoadFile lf(*CResourceHandler::get("local")->getResourceName(ResourceID(stem.to_string(), EResType::SAVEGAME)), MINIMAL_SERIALIZATION_VERSION); CLoadFile lf(*CResourceHandler::get()->getResourceName(ResourceID(stem.to_string(), EResType::SAVEGAME)), MINIMAL_SERIALIZATION_VERSION);
loadCommonState(lf); loadCommonState(lf);
logGlobal->info("Loading server state"); logGlobal->info("Loading server state");
lf >> *this; lf >> *this;