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

Replace most collections with Arbutils collections for more safety.
All checks were successful
continuous-integration/drone/push Build is passing
Details

Browse Source
This commit is contained in:
Deukhoofd
2020-03-22 19:21:40 +01:00
parent f190121e74
commit 27288563cd
40 changed files with 234 additions and 226 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -49,8 +49,8 @@ namespace CreatureLib::Battling {
Script* GetAttackScript() const { return _attackScript; }
protected:
void GetActiveScripts(std::vector<ScriptWrapper>& scripts) override {
scripts.emplace_back(&_attackScript);
void GetActiveScripts(Arbutils::Collections::List<ScriptWrapper>& scripts) override {
scripts.Append(&_attackScript);
GetUser()->GetActiveScripts(scripts);
}
};

4
src/Battling/TurnChoices/FleeTurnChoice.hpp
View File

@@ -12,7 +12,9 @@ namespace CreatureLib::Battling {
TurnChoiceKind GetKind() const override { return TurnChoiceKind ::Flee; }
protected:
void GetActiveScripts(std::vector<ScriptWrapper>& scripts) override { GetUser()->GetActiveScripts(scripts); }
void GetActiveScripts(Arbutils::Collections::List<ScriptWrapper>& scripts) override {
GetUser()->GetActiveScripts(scripts);
}
};
}

4
src/Battling/TurnChoices/PassTurnChoice.hpp
View File

@@ -11,7 +11,9 @@ namespace CreatureLib::Battling {
TurnChoiceKind GetKind() const override { return TurnChoiceKind ::Pass; }
protected:
void GetActiveScripts(std::vector<ScriptWrapper>& scripts) override { GetUser()->GetActiveScripts(scripts); }
void GetActiveScripts(Arbutils::Collections::List<ScriptWrapper>& scripts) override {
GetUser()->GetActiveScripts(scripts);
}
};
}

4
src/Battling/TurnChoices/SwitchTurnChoice.hpp
View File

@@ -16,7 +16,9 @@ namespace CreatureLib::Battling {
inline Creature* GetNewCreature() const { return _newCreature; }
protected:
void GetActiveScripts(std::vector<ScriptWrapper>& scripts) override { GetUser()->GetActiveScripts(scripts); }
void GetActiveScripts(Arbutils::Collections::List<ScriptWrapper>& scripts) override {
GetUser()->GetActiveScripts(scripts);
}
};
}