From 2ad441debc15f5ff509297f43e6e10e29878930c Mon Sep 17 00:00:00 2001 From: Deukhoofd Date: Fri, 10 Apr 2020 22:27:40 +0200 Subject: [PATCH] Update to new CreatureLib version. --- src/Library/Moves/MoveData.cpp | 2 +- src/Library/Moves/MoveData.hpp | 2 +- tests/TestLibrary/TestLibrary.cpp | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Library/Moves/MoveData.cpp b/src/Library/Moves/MoveData.cpp index e0c2319..9c2faf2 100644 --- a/src/Library/Moves/MoveData.cpp +++ b/src/Library/Moves/MoveData.cpp @@ -3,7 +3,7 @@ PkmnLib::Library::MoveData::MoveData(const Arbutils::CaseInsensitiveConstString& name, uint8_t type, PkmnLib::Library::MoveCategory category, uint8_t power, uint8_t accuracy, uint8_t baseUsage, CreatureLib::Library::AttackTarget target, int8_t priority, - const CreatureLib::Library::SecondaryEffect& effect, + const CreatureLib::Library::SecondaryEffect* effect, std::unordered_set flags) : AttackData(name, type, static_cast(category), power, accuracy, baseUsage, target, priority, effect, std::move(flags)) {} diff --git a/src/Library/Moves/MoveData.hpp b/src/Library/Moves/MoveData.hpp index f21f32e..2a359a1 100644 --- a/src/Library/Moves/MoveData.hpp +++ b/src/Library/Moves/MoveData.hpp @@ -11,7 +11,7 @@ namespace PkmnLib::Library { MoveData(const Arbutils::CaseInsensitiveConstString& name, uint8_t type, PkmnLib::Library::MoveCategory category, uint8_t power, uint8_t accuracy, uint8_t baseUsage, CreatureLib::Library::AttackTarget target, int8_t priority, - const CreatureLib::Library::SecondaryEffect& effect, std::unordered_set flags); + const CreatureLib::Library::SecondaryEffect* effect, std::unordered_set flags); PkmnLib::Library::MoveCategory GetCategory() const; }; diff --git a/tests/TestLibrary/TestLibrary.cpp b/tests/TestLibrary/TestLibrary.cpp index ac58127..7eda6a0 100644 --- a/tests/TestLibrary/TestLibrary.cpp +++ b/tests/TestLibrary/TestLibrary.cpp @@ -44,11 +44,11 @@ PkmnLib::Library::MoveLibrary* TestLibrary::BuildMoveLibrary() { lib->Insert("testMove"_cnc.GetHash(), new PkmnLib::Library::MoveData("testMove"_cnc, 0, PkmnLib::Library::MoveCategory::Physical, 50, 100, 20, CreatureLib::Library::AttackTarget::Adjacent, 0, - CreatureLib::Library::SecondaryEffect(), {})); + new CreatureLib::Library::SecondaryEffect(), {})); lib->Insert("testMove2"_cnc.GetHash(), new PkmnLib::Library::MoveData("testMove2"_cnc, 0, PkmnLib::Library::MoveCategory::Special, 30, 100, 10, CreatureLib::Library::AttackTarget::Adjacent, 0, - CreatureLib::Library::SecondaryEffect(), {})); + new CreatureLib::Library::SecondaryEffect(), {})); return lib; } PkmnLib::Library::ItemLibrary* TestLibrary::BuildItemLibrary() {