1
0
mirror of https://github.com/vcmi/vcmi.git synced 2025-11-25 22:42:04 +02:00
Changes were reviewed manually
This commit is contained in:
Alexander Wilms
2024-06-24 03:23:26 +02:00
parent 820b1b446e
commit 02e429e973
277 changed files with 815 additions and 815 deletions

View File

@@ -120,7 +120,7 @@ std::vector <TModID> CModHandler::validateAndSortDependencies(std::vector <TModI
{
if(isResolved(allMods.at(*it)))
{
resolvedOnCurrentTreeLevel.insert(*it); // Not to the resolvedModIDs, so current node childs will be resolved on the next iteration
resolvedOnCurrentTreeLevel.insert(*it); // Not to the resolvedModIDs, so current node children will be resolved on the next iteration
sortedValidMods.push_back(*it);
it = modsToResolve.erase(it);
continue;

View File

@@ -12,7 +12,7 @@
VCMI_LIB_NAMESPACE_BEGIN
class CModHandler;
class CModIndentifier;
class CModIdentifier;
class CModInfo;
struct CModVersion;
class JsonNode;
@@ -72,7 +72,7 @@ public:
std::vector<std::string> getAllMods() const;
std::vector<std::string> getActiveMods() const;
/// Returns human-readable string that describes erros encounter during mod loading, such as missing dependencies
/// Returns human-readable string that describes errors encounter during mod loading, such as missing dependencies
std::string getModLoadErrors() const;
const CModInfo & getModInfo(const TModID & modId) const;

View File

@@ -430,7 +430,7 @@ bool CIdentifierStorage::resolveIdentifier(const ObjectCallback & request) const
return true;
}
if (request.optional && identifiers.empty()) // failed to resolve optinal ID
if (request.optional && identifiers.empty()) // failed to resolve optional ID
{
return true;
}