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

Update Arbutils.
continuous-integration/drone/push Build is passing Details 

Signed-off-by: Deukhoofd <Deukhoofd@gmail.com>
This commit is contained in:
Deukhoofd 2020-08-08 12:28:20 +02:00
parent d6335359eb
commit 9cab330dbd
Signed by: Deukhoofd
GPG Key ID: F63E044490819F6F
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Battling/Models/CreateCreature.cpp
View File

@ -36,7 +36,7 @@ Creature* CreateCreature::Create() {
auto species = this->_library->GetSpeciesLibrary()->Get(this->_species.GetHash()); auto species = this->_library->GetSpeciesLibrary()->Get(this->_species.GetHash());
auto variant = species->GetVariant(this->_variant); auto variant = species->GetVariant(this->_variant);
Library::TalentIndex talent; Library::TalentIndex talent;
if (this->_talent.Empty()) { if (this->_talent.IsEmpty()) {
talent = variant->GetRandomTalent(rand); talent = variant->GetRandomTalent(rand);
} else { } else {
talent = variant->GetTalentIndex(this->_talent); talent = variant->GetTalentIndex(this->_talent);
@ -50,7 +50,7 @@ Creature* CreateCreature::Create() {
gender = species->GetRandomGender(rand); gender = species->GetRandomGender(rand);
} }
ArbUt::BorrowedPtr<const Library::Item> heldItem; ArbUt::BorrowedPtr<const Library::Item> heldItem;
if (!this->_heldItem.Empty()) { if (!this->_heldItem.IsEmpty()) {
if (!_library->GetItemLibrary()->TryGet(this->_heldItem.GetHash(), heldItem)) { if (!_library->GetItemLibrary()->TryGet(this->_heldItem.GetHash(), heldItem)) {
THROW_CREATURE("Invalid held item '" << this->_heldItem.c_str() << "'."); THROW_CREATURE("Invalid held item '" << this->_heldItem.c_str() << "'.");
} }

2
src/Library/Attacks/AttackData.hpp
View File

@ -38,7 +38,7 @@ namespace CreatureLib::Library {
inline AttackTarget GetTarget() const noexcept { return _target; } inline AttackTarget GetTarget() const noexcept { return _target; }
inline int8_t GetPriority() const noexcept { return _priority; } inline int8_t GetPriority() const noexcept { return _priority; }
inline bool HasSecondaryEffect() const noexcept { inline bool HasSecondaryEffect() const noexcept {
return _effect != nullptr && !_effect->GetEffectName().Empty(); return _effect != nullptr && !_effect->GetEffectName().IsEmpty();
} }
inline const std::unique_ptr<const SecondaryEffect>& GetSecondaryEffect() const noexcept { return _effect; } inline const std::unique_ptr<const SecondaryEffect>& GetSecondaryEffect() const noexcept { return _effect; }