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

Make Attack secondary effect a unique_ptr.
All checks were successful
continuous-integration/drone/push Build is passing
Details

Browse Source
This commit is contained in:
Deukhoofd
2020-05-26 14:41:43 +02:00
parent 8418c814b4
commit aba56d2fdd
3 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Battling/Flow/TurnHandler.cpp
View File

@@ -150,7 +150,7 @@ void TurnHandler::HandleAttackForTarget(ExecutingAttack* attack, Creature* targe
if (attackData->GetCategory() == Library::AttackCategory::Status) {
if (attackData->HasSecondaryEffect()) {
auto effect = attackData->GetSecondaryEffect();
auto& effect = attackData->GetSecondaryEffect();
bool hasSecondaryEffect;
if (effect->GetChance() == -1) {
hasSecondaryEffect = true;
@@ -175,7 +175,7 @@ void TurnHandler::HandleAttackForTarget(ExecutingAttack* attack, Creature* targe
bool preventSecondary = false;
HOOK(PreventSecondaryEffects, targetSource, attack, target, hitIndex, &preventSecondary);
if (!preventSecondary) {
auto effect = attackData->GetSecondaryEffect();
auto& effect = attackData->GetSecondaryEffect();
bool hasSecondaryEffect;
if (effect->GetChance() == -1) {
hasSecondaryEffect = true;

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

@@ -23,7 +23,7 @@ namespace CreatureLib::Battling {
if (battle != nullptr) {
if (_attack->GetAttack()->HasSecondaryEffect()) {
auto library = battle->GetLibrary();
auto effect = _attack->GetAttack()->GetSecondaryEffect();
auto& effect = _attack->GetAttack()->GetSecondaryEffect();
_attackScript = library->LoadScript(ScriptCategory::Attack, effect->GetEffectName());
if (_attackScript != nullptr) {
_attackScript->OnInitialize(effect->GetParameters());