From 680f949df8f818ef6895b2f51f6714369e0c4d0f Mon Sep 17 00:00:00 2001 From: Deukhoofd Date: Sun, 19 Apr 2020 18:50:32 +0200 Subject: [PATCH] Return nullptr from LearnableAttacks when trying to retrieve from empty. --- src/Library/CreatureData/LearnableAttacks.hpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/Library/CreatureData/LearnableAttacks.hpp b/src/Library/CreatureData/LearnableAttacks.hpp index f636b45..60b0315 100644 --- a/src/Library/CreatureData/LearnableAttacks.hpp +++ b/src/Library/CreatureData/LearnableAttacks.hpp @@ -33,6 +33,9 @@ namespace CreatureLib::Library { const List& GetAttacksForLevel(uint8_t level) const; virtual const AttackData* GetRandomAttack(Arbutils::Random rand = Arbutils::Random()) const { + if (_distinctAttacks.empty()) { + return nullptr; + } auto val = rand.Get(_distinctAttacks.size()); return *std::next(_distinctAttacks.begin(), val); }