games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-11-29 23:07:48 +02:00
Code Issues Releases Activity

code review

Browse Source
This commit is contained in:
Laserlicht
2025-07-31 00:46:43 +02:00
parent 3975cc3ada
commit 70c84910bd
3 changed files with 36 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

70
lib/modding/IdentifierStorage.cpp
View File

@@ -157,22 +157,22 @@ CIdentifierStorage::ObjectCallback CIdentifierStorage::ObjectCallback::fromNameA
void CIdentifierStorage::requestIdentifier(const std::string & scope, const std::string & type, const std::string & name, const std::function<void(si32)> & callback) const void CIdentifierStorage::requestIdentifier(const std::string & scope, const std::string & type, const std::string & name, const std::function<void(si32)> & callback) const
{ {
requestIdentifier(ObjectCallback::fromNameAndType(scope, type, name, callback, false, false)); requestIdentifier(ObjectCallback::fromNameAndType(scope, type, name, callback, false, false, true));
} }
void CIdentifierStorage::requestIdentifier(const std::string & scope, const std::string & fullName, const std::function<void(si32)> & callback) const void CIdentifierStorage::requestIdentifier(const std::string & scope, const std::string & fullName, const std::function<void(si32)> & callback) const
{ {
requestIdentifier(ObjectCallback::fromNameWithType(scope, fullName, callback, false)); requestIdentifier(ObjectCallback::fromNameWithType(scope, fullName, callback, false, true));
} }
void CIdentifierStorage::requestIdentifier(const std::string & type, const JsonNode & name, const std::function<void(si32)> & callback) const void CIdentifierStorage::requestIdentifier(const std::string & type, const JsonNode & name, const std::function<void(si32)> & callback) const
{ {
requestIdentifier(ObjectCallback::fromNameAndType(name.getModScope(), type, name.String(), callback, false, false)); requestIdentifier(ObjectCallback::fromNameAndType(name.getModScope(), type, name.String(), callback, false, false, true));
} }
void CIdentifierStorage::requestIdentifier(const JsonNode & name, const std::function<void(si32)> & callback) const void CIdentifierStorage::requestIdentifier(const JsonNode & name, const std::function<void(si32)> & callback) const
{ {
requestIdentifier(ObjectCallback::fromNameWithType(name.getModScope(), name.String(), callback, false)); requestIdentifier(ObjectCallback::fromNameWithType(name.getModScope(), name.String(), callback, false, true));
} }
void CIdentifierStorage::requestIdentifierIfNotNull(const std::string & type, const JsonNode & name, const std::function<void(si32)> & callback) const void CIdentifierStorage::requestIdentifierIfNotNull(const std::string & type, const JsonNode & name, const std::function<void(si32)> & callback) const
@@ -183,54 +183,60 @@ void CIdentifierStorage::requestIdentifierIfNotNull(const std::string & type, co
void CIdentifierStorage::requestIdentifierIfFound(const std::string & type, const JsonNode & name, const std::function<void(si32)> & callback) const void CIdentifierStorage::requestIdentifierIfFound(const std::string & type, const JsonNode & name, const std::function<void(si32)> & callback) const
{ {
requestIdentifier(ObjectCallback::fromNameAndType(name.getModScope(), type, name.String(), callback, false, true)); requestIdentifier(ObjectCallback::fromNameAndType(name.getModScope(), type, name.String(), callback, false, true, true));
} }
void CIdentifierStorage::requestIdentifierIfFound(const std::string & scope, const std::string & type, const std::string & name, const std::function<void(si32)> & callback) const void CIdentifierStorage::requestIdentifierIfFound(const std::string & scope, const std::string & type, const std::string & name, const std::function<void(si32)> & callback) const
{ {
requestIdentifier(ObjectCallback::fromNameAndType(scope, type, name, callback, false, true)); requestIdentifier(ObjectCallback::fromNameAndType(scope, type, name, callback, false, true, true));
} }
void CIdentifierStorage::tryRequestIdentifier(const std::string & scope, const std::string & type, const std::string & name, const std::function<void(si32)> & callback) const void CIdentifierStorage::tryRequestIdentifier(const std::string & scope, const std::string & type, const std::string & name, const std::function<void(si32)> & callback) const
{ {
requestIdentifier(ObjectCallback::fromNameAndType(scope, type, name, callback, true, false)); requestIdentifier(ObjectCallback::fromNameAndType(scope, type, name, callback, true, false, true));
} }
void CIdentifierStorage::tryRequestIdentifier(const std::string & type, const JsonNode & name, const std::function<void(si32)> & callback) const void CIdentifierStorage::tryRequestIdentifier(const std::string & type, const JsonNode & name, const std::function<void(si32)> & callback) const
{ {
requestIdentifier(ObjectCallback::fromNameAndType(name.getModScope(), type, name.String(), callback, true, false)); requestIdentifier(ObjectCallback::fromNameAndType(name.getModScope(), type, name.String(), callback, true, false, true));
} }
std::optional<si32> CIdentifierStorage::getIdentifier(const std::string & scope, const std::string & type, const std::string & name, bool silent, bool caseSensitive) const std::optional<si32> CIdentifierStorage::getIdentifier(const std::string & scope, const std::string & type, const std::string & name, bool silent) const
{ {
//assert(state != ELoadingState::LOADING); //assert(state != ELoadingState::LOADING);
auto options = ObjectCallback::fromNameAndType(scope, type, name, std::function<void(si32)>(), silent, false, caseSensitive); auto options = ObjectCallback::fromNameAndType(scope, type, name, std::function<void(si32)>(), silent, false, true);
return getIdentifierImpl(options, silent); return getIdentifierImpl(options, silent);
} }
std::optional<si32> CIdentifierStorage::getIdentifier(const std::string & type, const JsonNode & name, bool silent, bool caseSensitive) const std::optional<si32> CIdentifierStorage::getIdentifier(const std::string & type, const JsonNode & name, bool silent) const
{ {
assert(state != ELoadingState::LOADING); assert(state != ELoadingState::LOADING);
auto options = ObjectCallback::fromNameAndType(name.getModScope(), type, name.String(), std::function<void(si32)>(), silent, false, caseSensitive); auto options = ObjectCallback::fromNameAndType(name.getModScope(), type, name.String(), std::function<void(si32)>(), silent, false, true);
return getIdentifierImpl(options, silent); return getIdentifierImpl(options, silent);
} }
std::optional<si32> CIdentifierStorage::getIdentifier(const JsonNode & name, bool silent, bool caseSensitive) const std::optional<si32> CIdentifierStorage::getIdentifier(const JsonNode & name, bool silent) const
{ {
assert(state != ELoadingState::LOADING); assert(state != ELoadingState::LOADING);
auto options = ObjectCallback::fromNameWithType(name.getModScope(), name.String(), std::function<void(si32)>(), silent, caseSensitive); auto options = ObjectCallback::fromNameWithType(name.getModScope(), name.String(), std::function<void(si32)>(), silent, true);
return getIdentifierImpl(options, silent); return getIdentifierImpl(options, silent);
} }
std::optional<si32> CIdentifierStorage::getIdentifier(const std::string & scope, const std::string & fullName, bool silent, bool caseSensitive) const std::optional<si32> CIdentifierStorage::getIdentifier(const std::string & scope, const std::string & fullName, bool silent) const
{ {
assert(state != ELoadingState::LOADING); assert(state != ELoadingState::LOADING);
auto options = ObjectCallback::fromNameWithType(scope, fullName, std::function<void(si32)>(), silent, caseSensitive); auto options = ObjectCallback::fromNameWithType(scope, fullName, std::function<void(si32)>(), silent, true);
return getIdentifierImpl(options, silent);
}
std::optional<si32> CIdentifierStorage::getIdentifierCaseInsensitive(const std::string & scope, const std::string & type, const std::string & name, bool silent) const
{
auto options = ObjectCallback::fromNameAndType(scope, type, name, std::function<void(si32)>(), silent, false, false);
return getIdentifierImpl(options, silent); return getIdentifierImpl(options, silent);
} }
@@ -338,6 +344,7 @@ void CIdentifierStorage::registerObject(const std::string & scope, const std::st
{ {
logMod->trace("registered '%s' as %s:%s", fullID, scope, identifier); logMod->trace("registered '%s' as %s:%s", fullID, scope, identifier);
registeredObjects.insert(mapping); registeredObjects.insert(mapping);
registeredObjectsCaseLookup[boost::algorithm::to_lower_copy(mapping.first)] = mapping.first;
} }
else else
{ {
@@ -345,34 +352,6 @@ void CIdentifierStorage::registerObject(const std::string & scope, const std::st
} }
} }
template <typename MultiMap>
std::pair<typename MultiMap::const_iterator, typename MultiMap::const_iterator>
caseInsensitiveEqualRange(const MultiMap& mmap, const std::string& key)
{
using ConstIt = typename MultiMap::const_iterator;
std::string loweredKey = boost::algorithm::to_lower_copy(key);
ConstIt first = mmap.end();
ConstIt last = mmap.end();
for (ConstIt it = mmap.begin(); it != mmap.end(); ++it)
{
std::string loweredItKey = boost::algorithm::to_lower_copy(it->first);
if (loweredItKey == loweredKey)
{
if (first == mmap.end())
first = it;
last = std::next(it);
} else if (first != mmap.end())
// We've already found the matching range and now it's over
break;
}
return { first, last };
}
std::vector<CIdentifierStorage::ObjectData> CIdentifierStorage::getPossibleIdentifiers(const ObjectCallback & request) const std::vector<CIdentifierStorage::ObjectData> CIdentifierStorage::getPossibleIdentifiers(const ObjectCallback & request) const
{ {
std::set<std::string> allowedScopes; std::set<std::string> allowedScopes;
@@ -439,8 +418,9 @@ std::vector<CIdentifierStorage::ObjectData> CIdentifierStorage::getPossibleIdent
} }
std::string fullID = request.type + '.' + request.name; std::string fullID = request.type + '.' + request.name;
std::string fullIDCaseCorrected = request.caseSensitive ? fullID : registeredObjectsCaseLookup.at(boost::algorithm::to_lower_copy(fullID));
auto entries = request.caseSensitive ? registeredObjects.equal_range(fullID) : caseInsensitiveEqualRange(registeredObjects, fullID); auto entries = registeredObjects.equal_range(fullIDCaseCorrected);
if (entries.first != entries.second) if (entries.first != entries.second)
{ {

14
lib/modding/IdentifierStorage.h
View File

@@ -37,10 +37,10 @@ class DLL_LINKAGE CIdentifierStorage
bool caseSensitive; bool caseSensitive;
/// Builds callback from identifier in form "targetMod:type.name" /// Builds callback from identifier in form "targetMod:type.name"
static ObjectCallback fromNameWithType(const std::string & scope, const std::string & fullName, const std::function<void(si32)> & callback, bool optional, bool caseSensitive = true); static ObjectCallback fromNameWithType(const std::string & scope, const std::string & fullName, const std::function<void(si32)> & callback, bool optional, bool caseSensitive);
/// Builds callback from identifier in form "targetMod:name" /// Builds callback from identifier in form "targetMod:name"
static ObjectCallback fromNameAndType(const std::string & scope, const std::string & type, const std::string & fullName, const std::function<void(si32)> & callback, bool optional, bool bypassDependenciesCheck, bool caseSensitive = true); static ObjectCallback fromNameAndType(const std::string & scope, const std::string & type, const std::string & fullName, const std::function<void(si32)> & callback, bool optional, bool bypassDependenciesCheck, bool caseSensitive);
private: private:
ObjectCallback() = default; ObjectCallback() = default;
@@ -58,6 +58,7 @@ class DLL_LINKAGE CIdentifierStorage
}; };
std::multimap<std::string, ObjectData> registeredObjects; std::multimap<std::string, ObjectData> registeredObjects;
std::map<std::string, std::string> registeredObjectsCaseLookup;
mutable std::vector<ObjectCallback> scheduledRequests; mutable std::vector<ObjectCallback> scheduledRequests;
/// All non-optional requests that have failed to resolve, for debug & error reporting /// All non-optional requests that have failed to resolve, for debug & error reporting
@@ -98,10 +99,11 @@ public:
void tryRequestIdentifier(const std::string & type, const JsonNode & name, const std::function<void(si32)> & callback) const; void tryRequestIdentifier(const std::string & type, const JsonNode & name, const std::function<void(si32)> & callback) const;
/// get identifier immediately. If identifier is not know and not silent call will result in error message /// get identifier immediately. If identifier is not know and not silent call will result in error message
std::optional<si32> getIdentifier(const std::string & scope, const std::string & type, const std::string & name, bool silent = false, bool caseSensitive = true) const; std::optional<si32> getIdentifier(const std::string & scope, const std::string & type, const std::string & name, bool silent = false) const;
std::optional<si32> getIdentifier(const std::string & type, const JsonNode & name, bool silent = false, bool caseSensitive = true) const; std::optional<si32> getIdentifier(const std::string & type, const JsonNode & name, bool silent = false) const;
std::optional<si32> getIdentifier(const JsonNode & name, bool silent = false, bool caseSensitive = true) const; std::optional<si32> getIdentifier(const JsonNode & name, bool silent = false) const;
std::optional<si32> getIdentifier(const std::string & scope, const std::string & fullName, bool silent = false, bool caseSensitive = true) const; std::optional<si32> getIdentifier(const std::string & scope, const std::string & fullName, bool silent = false) const;
std::optional<si32> getIdentifierCaseInsensitive(const std::string & scope, const std::string & type, const std::string & name, bool silent) const;
/// registers new object /// registers new object
void registerObject(const std::string & scope, const std::string & type, const std::string & name, si32 identifier); void registerObject(const std::string & scope, const std::string & type, const std::string & name, si32 identifier);

6
server/processors/PlayerMessageProcessor.cpp
View File

@@ -428,7 +428,7 @@ void PlayerMessageProcessor::cheatGiveArmy(PlayerColor player, const CGHeroInsta
{ {
} }
std::optional<int32_t> creatureId = LIBRARY->identifiers()->getIdentifier(ModScope::scopeGame(), "creature", creatureIdentifier, false, false); std::optional<int32_t> creatureId = LIBRARY->identifiers()->getIdentifierCaseInsensitive(ModScope::scopeGame(), "creature", creatureIdentifier, false);
if(creatureId.has_value()) if(creatureId.has_value())
{ {
@@ -469,7 +469,7 @@ void PlayerMessageProcessor::cheatGiveArtifacts(PlayerColor player, const CGHero
{ {
for (auto const & word : words) for (auto const & word : words)
{ {
auto artID = LIBRARY->identifiers()->getIdentifier(ModScope::scopeGame(), "artifact", word, false, false); auto artID = LIBRARY->identifiers()->getIdentifierCaseInsensitive(ModScope::scopeGame(), "artifact", word, false);
if(artID && LIBRARY->arth->objects[*artID]) if(artID && LIBRARY->arth->objects[*artID])
gameHandler->giveHeroNewArtifact(hero, ArtifactID(*artID), ArtifactPosition::FIRST_AVAILABLE); gameHandler->giveHeroNewArtifact(hero, ArtifactID(*artID), ArtifactPosition::FIRST_AVAILABLE);
} }
@@ -728,7 +728,7 @@ void PlayerMessageProcessor::cheatSkill(PlayerColor player, const CGHeroInstance
return; return;
} }
std::optional<int32_t> skillId = LIBRARY->identifiers()->getIdentifier(ModScope::scopeGame(), "skill", identifier, false, false); std::optional<int32_t> skillId = LIBRARY->identifiers()->getIdentifierCaseInsensitive(ModScope::scopeGame(), "skill", identifier, false);
if(!skillId.has_value()) if(!skillId.has_value())
return; return;