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

Make all individual scripts smart pointers.
Some checks failed
continuous-integration/drone/push Build is failing
Details

Browse Source
This commit is contained in:
Deukhoofd
2020-06-02 13:43:44 +02:00
parent dba1275813
commit e4b9550efa
11 changed files with 48 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/Battling/TurnChoices/AttackTurnChoice.hpp
View File

@@ -11,7 +11,7 @@ namespace CreatureLib::Battling {
class AttackTurnChoice : public BaseTurnChoice {
ArbUt::BorrowedPtr<LearnedAttack> _attack;
CreatureIndex _target;
Script* _attackScript = nullptr;
std::unique_ptr<Script> _attackScript = nullptr;
bool _scriptIsTaken = false;
void ResolveScript() {
@@ -25,7 +25,8 @@ namespace CreatureLib::Battling {
if (_attack->GetAttack()->HasSecondaryEffect()) {
auto library = battle->GetLibrary();
auto& effect = _attack->GetAttack()->GetSecondaryEffect();
_attackScript = library->LoadScript(ScriptCategory::Attack, effect->GetEffectName());
_attackScript =
std::unique_ptr<Script>(library->LoadScript(ScriptCategory::Attack, effect->GetEffectName()));
if (_attackScript != nullptr) {
_attackScript->OnInitialize(effect->GetParameters());
}
@@ -45,7 +46,6 @@ namespace CreatureLib::Battling {
~AttackTurnChoice() {
if (!_scriptIsTaken) {
delete _attackScript;
}
}
@@ -58,11 +58,9 @@ namespace CreatureLib::Battling {
return _attack->GetAttack()->GetPriority();
}
void MarkScriptAsTaken() { _scriptIsTaken = true; }
const CreatureIndex& GetTarget() const noexcept { return _target; }
Script* GetAttackScript() const noexcept { return _attackScript; }
const std::unique_ptr<Script>& GetAttackScript() const noexcept { return _attackScript; }
size_t ScriptCount() const override { return 1 + GetUser()->ScriptCount(); }
protected: