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

Fixed Segfault when overriding talent.
continuous-integration/drone/push Build is passing Details

This commit is contained in:
Deukhoofd 2020-08-01 10:27:46 +02:00
parent fa5184ad77
commit 670abd7229
Signed by: Deukhoofd
GPG Key ID: ADF2E9256009EDCE
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -171,9 +171,11 @@ void Battling::Creature::Heal(uint32_t amount, bool canRevive) {
void Battling::Creature::OverrideActiveTalent(const ArbUt::StringView& talent) { void Battling::Creature::OverrideActiveTalent(const ArbUt::StringView& talent) {
_hasOverridenTalent = true; _hasOverridenTalent = true;
_activeTalent->OnRemove(); if (_activeTalent != nullptr) {
_activeTalent->OnRemove();
_activeTalent.reset(this->_library->LoadScript(ScriptCategory::Talent, talent));
}
_overridenTalentName = talent; _overridenTalentName = talent;
_activeTalent.reset(this->_library->LoadScript(ScriptCategory::Talent, talent));
} }
const std::unordered_set<uint8_t>& Battling::Creature::GetTypes() const noexcept { return _types; } const std::unordered_set<uint8_t>& Battling::Creature::GetTypes() const noexcept { return _types; }

8
tests/BattleTests/CreatureTests.cpp
View File

@ -46,4 +46,12 @@ TEST_CASE("Increase creature stat boost", "[Library]") {
delete creature; delete creature;
} }
TEST_CASE("Override Creature talent", "[Library]") {
auto library = TestLibrary::Get();
auto creature = CreateCreature(library, "testSpecies1"_cnc, 1).Create();
creature->OverrideActiveTalent("foobar");
REQUIRE(creature->GetActiveTalent() == "foobar");
delete creature;
}
#endif #endif