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

Implement Species destructor of base.
continuous-integration/drone/push Build is passing Details

This commit is contained in:
Deukhoofd 2020-02-09 11:02:29 +01:00
parent 450753cb50
commit 4ee5a14b4c
Signed by: Deukhoofd
GPG Key ID: ADF2E9256009EDCE
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
conanfile.py
View File

@ -44,7 +44,7 @@ class PkmnLibConan(ConanFile):
self.options["AngelScript"].link_std_statically = True self.options["AngelScript"].link_std_statically = True
def requirements(self): def requirements(self):
self.requires("CreatureLib/f973259bef30b9ba1ff095884c81f0e5f4b94a09@creaturelib/master") self.requires("CreatureLib/3f57051219232f42bacf3475d231cfe693e1e101@creaturelib/master")
if self.options.script_handler == "angelscript": if self.options.script_handler == "angelscript":
self.requires("AngelScript/2.34@AngelScript/Deukhoofd") self.requires("AngelScript/2.34@AngelScript/Deukhoofd")
else: else:

2
src/Library/Species/PokemonSpecies.hpp
View File

@ -16,6 +16,8 @@ namespace PkmnLib::Library {
: CreatureSpecies(id, name, defaultVariant, genderRatio, growthRate, captureRate), : CreatureSpecies(id, name, defaultVariant, genderRatio, growthRate, captureRate),
_baseHappiness(baseHappiness) {} _baseHappiness(baseHappiness) {}
~PokemonSpecies() override = default;
inline uint8_t GetBaseHappiness() const { return _baseHappiness; } inline uint8_t GetBaseHappiness() const { return _baseHappiness; }
inline const PokemonForme* GetDefaultForme() const { inline const PokemonForme* GetDefaultForme() const {