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

Use unique pointers in scriptset.
All checks were successful
continuous-integration/drone/push Build is passing
Details

Browse Source
This commit is contained in:
Deukhoofd
2020-06-02 15:03:31 +02:00
parent 23e2bc73bc
commit 1ef50fd3a6
7 changed files with 22 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Battling/Models/Battle.cpp
View File

@@ -137,7 +137,7 @@ void Battle::AddVolatileScript(const ConstString& key) {
ss << "Invalid volatile script requested for battle: '" << key.c_str() << "'.";
throw CreatureException(ss.str());
}
return _volatile.Add(script);
return _volatile.Add(script.GetRaw());
}
void Battle::AddVolatileScript(Script* script) { return _volatile.Add(script); }
void Battle::RemoveVolatileScript(Script* script) { _volatile.Remove(script->GetName()); }

4
src/Battling/Models/Battle.hpp
View File

@@ -82,8 +82,8 @@ namespace CreatureLib::Battling {
const ArbUt::UniquePtrList<BattleParty>& GetParties() const noexcept { return _parties; }
const ArbUt::UniquePtrList<BattleSide>& GetSides() const noexcept { return _sides; }
Script* GetVolatileScript(const ConstString& key) const { return _volatile.Get(key); }
Script* GetVolatileScript(uint32_t keyHash) const noexcept { return _volatile.Get(keyHash); }
ArbUt::BorrowedPtr<Script> GetVolatileScript(const ConstString& key) const { return _volatile.Get(key); }
ArbUt::BorrowedPtr<Script> GetVolatileScript(uint32_t keyHash) const noexcept { return _volatile.Get(keyHash); }
void AddVolatileScript(const ConstString& key);
void AddVolatileScript(Script* script);
void RemoveVolatileScript(const ConstString& name) { _volatile.Remove(name); }

2
src/Battling/Models/Creature.cpp
View File

@@ -225,7 +225,7 @@ void Battling::Creature::AddVolatileScript(const ConstString& name) {
ss << "Invalid volatile script requested for creature: '" << name.c_str() << "'.";
throw CreatureException(ss.str());
}
_volatile.Add(script);
_volatile.Add(script.GetRaw());
}
void Battling::Creature::AddVolatileScript(Script* script) { _volatile.Add(script); }

4
src/Battling/ScriptHandling/ScriptAggregator.hpp
View File

@@ -44,7 +44,7 @@ namespace CreatureLib::Battling {
return nullptr;
return (*s).get();
} else {
auto& set = *current.GetScriptSet()->GetIterator();
auto& set = current.GetScriptSet()->GetIterator();
auto count = set.Count();
if (_setIndex >= count) {
_index++;
@@ -56,7 +56,7 @@ namespace CreatureLib::Battling {
_index++;
_setIndex = 0;
}
return v;
return v.GetRaw();
}
}
};

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

@@ -2,21 +2,17 @@
#define CREATURELIB_SCRIPTSET_HPP
#include <Arbutils/Collections/Dictionary.hpp>
#include <Arbutils/Collections/List.hpp>
#include <Arbutils/Memory/UniquePtrList.hpp>
#include <any>
#include "Script.hpp"
namespace CreatureLib::Battling {
class ScriptSet {
ArbUt::List<Script*> _scripts;
ArbUt::UniquePtrList<Script> _scripts;
ArbUt::Dictionary<uint32_t, size_t> _lookup;
public:
~ScriptSet() {
for (auto s : _scripts) {
delete s;
}
}
~ScriptSet() = default;
static constexpr size_t defaultCapacity = 8;
ScriptSet() : _scripts(defaultCapacity), _lookup(defaultCapacity){};
@@ -33,9 +29,11 @@ namespace CreatureLib::Battling {
_lookup.Insert(script->GetName(), _scripts.Count() - 1);
}
Script* Get(const ArbUt::CaseInsensitiveConstString& key) const { return Get(key.GetHash()); }
ArbUt::BorrowedPtr<Script> Get(const ArbUt::CaseInsensitiveConstString& key) const {
return Get(key.GetHash());
}
Script* Get(uint32_t keyHash) const noexcept {
ArbUt::BorrowedPtr<Script> Get(uint32_t keyHash) const noexcept {
size_t v;
if (_lookup.TryGet(keyHash, v)) {
return _scripts[v];
@@ -50,7 +48,6 @@ namespace CreatureLib::Battling {
if (_lookup.TryGet(keyHash, v)) {
auto script = _scripts[v];
script->OnRemove();
delete script;
_scripts.Remove(v);
_lookup.Remove(keyHash);
}
@@ -71,7 +68,7 @@ namespace CreatureLib::Battling {
inline size_t Count() const { return _scripts.Count(); }
const ArbUt::List<Script*>* GetIterator() const { return &_scripts; }
const ArbUt::UniquePtrList<Script>& GetIterator() const { return _scripts; }
};
}