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

moved contains functions for multimap to Globals.h

Browse Source
This commit is contained in:
Henning Koehler 2017-08-25 18:29:34 +12:00
parent c0740e3623
commit 3cc84e5975
4 changed files with 18 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Global.h
View File

@ -676,6 +676,18 @@ namespace vstd
return v3; return v3;
} }
template <typename Key, typename V>
bool containsMapping(const std::multimap<Key,V> & map, const std::pair<const Key,V> & mapping)
{
auto range = map.equal_range(mapping.first);
for(auto contained = range.first; contained != range.second; contained++)
{
if(mapping.second == contained->second)
return true;
}
return false;
}
using boost::math::round; using boost::math::round;
} }
using vstd::operator-=; using vstd::operator-=;

6
config/skills.json
View File

@ -4,7 +4,7 @@
"description" : "Hero generates 250 gold each day.", "description" : "Hero generates 250 gold each day.",
"effects" : [ "effects" : [
{ {
"subtype" : 13, "subtype" : "skill.estates",
"type" : "SECONDARY_SKILL_PREMY", "type" : "SECONDARY_SKILL_PREMY",
"val" : 250, "val" : 250,
"valueType" : "BASE_NUMBER" "valueType" : "BASE_NUMBER"
@ -15,7 +15,7 @@
"description" : "Hero generates 500 gold each day.", "description" : "Hero generates 500 gold each day.",
"effects" : [ "effects" : [
{ {
"subtype" : 13, "subtype" : "skill.estates",
"type" : "SECONDARY_SKILL_PREMY", "type" : "SECONDARY_SKILL_PREMY",
"val" : 500, "val" : 500,
"valueType" : "BASE_NUMBER" "valueType" : "BASE_NUMBER"
@ -26,7 +26,7 @@
"description" : "Hero generates 1000 gold each day.", "description" : "Hero generates 1000 gold each day.",
"effects" : [ "effects" : [
{ {
"subtype" : 13, "subtype" : "skill.estates",
"type" : "SECONDARY_SKILL_PREMY", "type" : "SECONDARY_SKILL_PREMY",
"val" : 1000, "val" : 1000,
"valueType" : "BASE_NUMBER" "valueType" : "BASE_NUMBER"

4
lib/CModHandler.cpp
View File

@ -204,8 +204,8 @@ void CIdentifierStorage::registerObject(std::string scope, std::string type, std
std::string fullID = type + '.' + name; std::string fullID = type + '.' + name;
checkIdentifier(fullID); checkIdentifier(fullID);
auto mapping = std::make_pair(fullID, data); std::pair<const std::string, ObjectData> mapping = std::make_pair(fullID, data);
if(!registeredObjects.contains(mapping)) if(!vstd::containsMapping(registeredObjects, mapping))
{ {
CLogger::getLogger(CLoggerDomain("identifier"))->traceStream() << "registered " << fullID << " as " << scope << ":" << identifier; CLogger::getLogger(CLoggerDomain("identifier"))->traceStream() << "registered " << fullID << " as " << scope << ":" << identifier;
registeredObjects.insert(mapping); registeredObjects.insert(mapping);

17
lib/CModHandler.h
View File

@ -63,22 +63,7 @@ class CIdentifierStorage
} }
}; };
class ObjectMap: public std::multimap<std::string, ObjectData> std::multimap<std::string, ObjectData> registeredObjects;
{
public:
bool contains(const value_type & value) const
{
auto range = equal_range(value.first);
for(auto contained = range.first; contained != range.second; contained++)
{
if(value.second == contained->second)
return true;
}
return false;
}
};
ObjectMap registeredObjects;
std::vector<ObjectCallback> scheduledRequests; std::vector<ObjectCallback> scheduledRequests;
ELoadingState state; ELoadingState state;