games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-11-06 09:09:40 +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
Download Patch File Download Diff File Expand all files Collapse all files

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;
checkIdentifier(fullID);
auto mapping = std::make_pair(fullID, data);
if(!registeredObjects.contains(mapping))
std::pair<const std::string, ObjectData> mapping = std::make_pair(fullID, data);
if(!vstd::containsMapping(registeredObjects, mapping))
{
CLogger::getLogger(CLoggerDomain("identifier"))->traceStream() << "registered " << fullID << " as " << scope << ":" << identifier;
registeredObjects.insert(mapping);

17
lib/CModHandler.h
View File

@@ -63,22 +63,7 @@ class CIdentifierStorage
}
};
class ObjectMap: public std::multimap<std::string, ObjectData>
{
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::multimap<std::string, ObjectData> registeredObjects;
std::vector<ObjectCallback> scheduledRequests;
ELoadingState state;