Deukhoofd/CreatureLib
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Make scriptset return scripts in order of insertion, unit tests for ScriptSource

Browse Source
This commit is contained in:
Deukhoofd
2019-11-12 18:38:09 +01:00
parent cdd1ac992f
commit fd16152121
3 changed files with 127 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/Battling/ScriptHandling/ScriptSet.hpp
View File

@@ -7,27 +7,32 @@
namespace CreatureLib::Battling{
class ScriptSet{
std::unordered_map<std::string, Script*> _scripts;
std::vector<Script*> _scripts;
std::unordered_map<std::string, size_t> _lookup;
public:
void Add(Script* script){
auto f = _scripts.find(script->GetName());
if (f != _scripts.end()){
f->second->Stack();
}
else{
_scripts.insert({script->GetName(), script});
auto f = _lookup.find(script->GetName());
if (f != _lookup.end()){
_scripts[f.operator*().second]->Stack();
return;
}
_scripts.push_back(script);
_lookup.insert({script->GetName(), _scripts.size() - 1});
}
void Remove(const std::string& key){
_scripts.erase(key);
auto find = _lookup.find(key);
if (find != _lookup.end()){
_scripts.erase(_scripts.begin() + find.operator*().second);
_lookup.erase(key);
}
}
size_t Count() const{
return _scripts.size();
}
const std::unordered_map<std::string, Script *> * GetIterator() const{
const std::vector<Script *> * GetIterator() const{
return &_scripts;
}
};