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

Make Creature class variables mostly protected instead of private.
continuous-integration/drone/push Build is failing Details

This commit is contained in:
Deukhoofd 2020-01-02 18:38:56 +01:00
parent b98b470f0d
commit 1a246f57e8
Signed by: Deukhoofd
GPG Key ID: ADF2E9256009EDCE
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -17,6 +17,7 @@ namespace CreatureLib::Battling {
class BattleLibrary; class BattleLibrary;
class Creature : public ScriptSource { class Creature : public ScriptSource {
protected:
const BattleLibrary* _library; const BattleLibrary* _library;
GetProperty(const Library::CreatureSpecies*, Species); GetProperty(const Library::CreatureSpecies*, Species);
@ -30,7 +31,7 @@ namespace CreatureLib::Battling {
GetProperty(const Library::Item*, HeldItem); GetProperty(const Library::Item*, HeldItem);
GetProperty(uint32_t, CurrentHealth); GetProperty(uint32_t, CurrentHealth);
private: protected:
Core::StatisticSet<int8_t> _statBoost; Core::StatisticSet<int8_t> _statBoost;
Core::StatisticSet<uint32_t> _flatStats; Core::StatisticSet<uint32_t> _flatStats;
Core::StatisticSet<uint32_t> _boostedStats; Core::StatisticSet<uint32_t> _boostedStats;
@ -52,6 +53,7 @@ namespace CreatureLib::Battling {
Script* _status = nullptr; Script* _status = nullptr;
ScriptSet _volatile = {}; ScriptSet _volatile = {};
private
void OnFaint(); void OnFaint();
public: public:

2
src/GenericTemplates.hpp
View File

@ -2,7 +2,7 @@
\brief GetProperty creates a simple wrapper for a field, creating a private field, and a public getter method. \brief GetProperty creates a simple wrapper for a field, creating a private field, and a public getter method.
*/ */
#define GetProperty(type, name) \ #define GetProperty(type, name) \
private: \ protected: \
type __##name; \ type __##name; \
\ \
public: \ public: \