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

Add ConstString to several other places where context isn't changed much during runtime.
All checks were successful
continuous-integration/drone/push Build is passing
Details

Browse Source
This commit is contained in:
Deukhoofd
2020-02-28 19:23:24 +01:00
parent 469fcfe280
commit 5a05a2f4d3
17 changed files with 73 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/Battling/Models/Creature.hpp
View File

@@ -46,7 +46,7 @@ namespace CreatureLib::Battling {
Script* _activeTalent = nullptr;
bool _hasOverridenTalent;
std::string _overridenTalentName = "";
ConstString _overridenTalentName = ""_cnc;
std::unordered_set<Creature*> _seenOpponents = {};
std::vector<LearnedAttack*> _attacks;
@@ -98,7 +98,7 @@ namespace CreatureLib::Battling {
bool IsOnBattleField() const { return _onBattleField; }
const std::string& GetNickname() const { return _nickname; }
const std::string& GetActiveTalent() const;
const ConstString& GetActiveTalent() const;
[[nodiscard]] bool IsFainted() const;
[[nodiscard]] const std::vector<uint8_t>& GetTypes() const;
@@ -108,7 +108,7 @@ namespace CreatureLib::Battling {
void ChangeLevel(int8_t amount);
void Damage(uint32_t damage, DamageSource source);
void Heal(uint32_t amount);
void OverrideActiveTalent(const std::string& talent);
void OverrideActiveTalent(const ConstString& talent);
void AddExperience(uint32_t amount);
void MarkOpponentAsSeen(Creature* creature) { _seenOpponents.insert(creature); }
@@ -116,11 +116,11 @@ namespace CreatureLib::Battling {
void GetActiveScripts(std::vector<ScriptWrapper>& scripts) override;
void ClearVolatileScripts();
void AddVolatileScript(const std::string& name);
void AddVolatileScript(const ConstString& name);
void AddVolatileScript(Script* script);
void RemoveVolatileScript(const std::string& name);
void RemoveVolatileScript(const ConstString& name);
void RemoveVolatileScript(Script* script);
void HasVolatileScript(const std::string& name) const;
void HasVolatileScript(const ConstString& name) const;
std::vector<LearnedAttack*>& GetAttacks() { return _attacks; }