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

Cleanup of ScriptAggregator class.
All checks were successful
continuous-integration/drone/push Build is passing
Details

Browse Source
This commit is contained in:
Deukhoofd
2020-04-23 23:23:58 +02:00
parent 3a11bba913
commit dd668f2b1c
11 changed files with 89 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -167,9 +167,9 @@ bool Battling::Creature::HasType(uint8_t type) const noexcept {
}
void Battling::Creature::GetActiveScripts(Arbutils::Collections::List<ScriptWrapper>& scripts) {
scripts.Append(&_activeTalent);
scripts.Append(&_status);
scripts.Append(&_volatile);
scripts.Append(ScriptWrapper::FromScript(&_activeTalent));
scripts.Append(ScriptWrapper::FromScript(&_status));
scripts.Append(ScriptWrapper::FromSet(&_volatile));
if (_side != nullptr) {
_side->GetActiveScripts(scripts);
}