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

- files in local directories (saves & configs) now always have higher

Browse Source 
priority than mods. Fixes #1685 and #1733
- fixed possible crash on exit in dispose() function
- (vcmibuilder) fixes problem with partial mp3 -> ogg conversion
This commit is contained in:
Ivan Savenko
2014-03-08 16:05:23 +00:00
parent afcb7072eb
commit d2ae847ecf
13 changed files with 97 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
client/CPreGame.cpp
View File

@ -920,7 +920,7 @@ void CSelectionScreen::startScenario()
overWrite += boost::bind(&CCallback::save, LOCPLINT->cb.get(), saveGameName);
overWrite += boost::bind(&CGuiHandler::popIntTotally, &GH, this);
if(CResourceHandler::get()->existsResource(ResourceID(saveGameName, EResType::CLIENT_SAVEGAME)))
if(CResourceHandler::get("local")->existsResource(ResourceID(saveGameName, EResType::CLIENT_SAVEGAME)))
{
std::string hlp = CGI->generaltexth->allTexts[493]; //%s exists. Overwrite?
boost::algorithm::replace_first(hlp, "%s", sel->txt->text);
@ -1354,7 +1354,7 @@ void SelectionTab::select( int position )
if(txt)
{
std::string filename = *CResourceHandler::get()->getResourceName(
std::string filename = *CResourceHandler::get("local")->getResourceName(
ResourceID(curItems[py]->fileURI, EResType::CLIENT_SAVEGAME));
txt->setText(CFileInfo(filename).getBaseName());
}
@ -1479,7 +1479,7 @@ void SelectionTab::printMaps(SDL_Surface *to)
}
else
{
name = CFileInfo(*CResourceHandler::get()->getResourceName(
name = CFileInfo(*CResourceHandler::get("local")->getResourceName(
ResourceID(currentItem->fileURI, EResType::CLIENT_SAVEGAME))).getBaseName();
}