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

Merge pull request #5476 from IvanSavenko/hotfix

Browse Source 
[1.6.7] Fixes for reported issues
This commit is contained in:
Ivan Savenko
2025-02-25 19:38:16 +02:00
committed by GitHub
parent 5a813feaa6 e7fbe2d387
commit 1e020a3b56
5 changed files with 58 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
client/lobby/SelectionTab.cpp
View File

@@ -961,31 +961,38 @@ void SelectionTab::parseCampaigns(const std::unordered_set<ResourcePath> & files
allItems.reserve(files.size());
for(auto & file : files)
{
auto info = std::make_shared<ElementInfo>();
info->fileURI = file.getOriginalName();
info->campaignInit();
info->name = info->getNameForList();
if(info->campaign)
try
{
// skip campaigns organized in sets
std::string foundInSet = "";
for (auto const & set : campaignSets.Struct())
for (auto const & item : set.second["items"].Vector())
if(file.getName() == ResourcePath(item["file"].String()).getName())
foundInSet = set.first;
// set has to be used in main menu
bool setInMainmenu = false;
if(!foundInSet.empty())
for (auto const & item : mainmenu["window"]["items"].Vector())
if(item["name"].String() == "campaign")
for (auto const & button : item["buttons"].Vector())
if(boost::algorithm::ends_with(boost::algorithm::to_lower_copy(button["command"].String()), boost::algorithm::to_lower_copy(foundInSet)))
setInMainmenu = true;
auto info = std::make_shared<ElementInfo>();
info->fileURI = file.getOriginalName();
info->campaignInit();
info->name = info->getNameForList();
if(!setInMainmenu)
allItems.push_back(info);
if(info->campaign)
{
// skip campaigns organized in sets
std::string foundInSet = "";
for (auto const & set : campaignSets.Struct())
for (auto const & item : set.second["items"].Vector())
if(file.getName() == ResourcePath(item["file"].String()).getName())
foundInSet = set.first;
// set has to be used in main menu
bool setInMainmenu = false;
if(!foundInSet.empty())
for (auto const & item : mainmenu["window"]["items"].Vector())
if(item["name"].String() == "campaign")
for (auto const & button : item["buttons"].Vector())
if(boost::algorithm::ends_with(boost::algorithm::to_lower_copy(button["command"].String()), boost::algorithm::to_lower_copy(foundInSet)))
setInMainmenu = true;
if(!setInMainmenu)
allItems.push_back(info);
}
}
catch(const std::exception & e)
{
logGlobal->error("Error: Failed to process campaign %s: %s", file.getName(), e.what());
}
}
}

3
client/widgets/Images.cpp
View File

@@ -442,7 +442,8 @@ void CShowableAnim::blitImage(size_t frame, size_t group, Canvas & to)
if(img)
{
img->setAlpha(alpha);
img->setOverlayColor(Colors::TRANSPARENCY);
if (getModeForFlags(flags) == EImageBlitMode::WITH_SHADOW_AND_SELECTION)
img->setOverlayColor(Colors::TRANSPARENCY);
to.draw(img, pos.topLeft(), src);
}
}

11
lib/filesystem/CZipLoader.cpp
View File

@@ -224,7 +224,18 @@ bool ZipArchive::extract(const boost::filesystem::path & where, const std::strin
std::fstream destFile(fullName.c_str(), std::ios::out | std::ios::binary);
if (!destFile.good())
{
#ifdef VCMI_WINDOWS
if (fullName.size() < 260)
logGlobal->error("Failed to open file '%s'", fullName.c_str());
else
logGlobal->error("Failed to open file with long path '%s' (%d characters)", fullName.c_str(), fullName.size());
#else
logGlobal->error("Failed to open file '%s'", fullName.c_str());
#endif
return false;
}
if (!extractCurrent(archive, destFile))
return false;

14
lib/mapObjectConstructors/CObjectClassesHandler.cpp
View File

@@ -177,7 +177,12 @@ void CObjectClassesHandler::loadSubObject(const std::string & scope, const std::
registerObject(scope, baseObject->getJsonKey(), subObject->getSubTypeName(), subObject->subtype);
for(const auto & compatID : entry["compatibilityIdentifiers"].Vector())
registerObject(scope, baseObject->getJsonKey(), compatID.String(), subObject->subtype);
{
if (identifier != compatID.String())
registerObject(scope, baseObject->getJsonKey(), compatID.String(), subObject->subtype);
else
logMod->warn("Mod '%s' map object '%s': compatibility identifier has same name as object itself!");
}
}
void CObjectClassesHandler::loadSubObject(const std::string & scope, const std::string & identifier, const JsonNode & entry, ObjectClass * baseObject, size_t index)
@@ -192,7 +197,12 @@ void CObjectClassesHandler::loadSubObject(const std::string & scope, const std::
registerObject(scope, baseObject->getJsonKey(), subObject->getSubTypeName(), subObject->subtype);
for(const auto & compatID : entry["compatibilityIdentifiers"].Vector())
registerObject(scope, baseObject->getJsonKey(), compatID.String(), subObject->subtype);
{
if (identifier != compatID.String())
registerObject(scope, baseObject->getJsonKey(), compatID.String(), subObject->subtype);
else
logMod->warn("Mod '%s' map object '%s': compatibility identifier has same name as object itself!");
}
}
TObjectTypeHandler CObjectClassesHandler::loadSubObjectFromJson(const std::string & scope, const std::string & identifier, const JsonNode & entry, ObjectClass * baseObject, size_t index)

3
lib/modding/ModManager.cpp
View File

@@ -763,6 +763,9 @@ void ModDependenciesResolver::tryAddMods(TModList modsToResolve, const ModsStora
if (mod.isTranslation() && CGeneralTextHandler::getPreferredLanguage() != mod.getBaseLanguage())
return false;
if(!mod.isCompatible())
return false;
if(mod.getDependencies().size() > resolvedModIDs.size())
return false;