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

Removes some variables that are better handled in implementations.
Some checks failed
continuous-integration/drone/push Build is failing
Details

Browse Source
This commit is contained in:
Deukhoofd
2019-12-27 12:19:38 +01:00
parent 72c51c6513
commit ae4d8f5e12
8 changed files with 13 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Library/CreatureData/CreatureSpecies.cpp
View File

@@ -3,9 +3,9 @@
using namespace CreatureLib::Library;
CreatureSpecies::CreatureSpecies(uint16_t id, std::string name, const SpeciesVariant* defaultVariant, float genderRatio,
std::string growthRate, uint8_t captureRate, uint8_t baseHappiness)
std::string growthRate, uint8_t captureRate)
: __Id(id), __GenderRate(genderRatio), __GrowthRate(std::move(growthRate)), __CaptureRate(captureRate),
__BaseHappiness(baseHappiness), _variants({{"default", defaultVariant}}), _name(std::move(name)) {}
_variants({{"default", defaultVariant}}), _name(std::move(name)) {}
const SpeciesVariant* CreatureSpecies::GetVariant(const std::string& key) const { return _variants.at(key); }

3
src/Library/CreatureData/CreatureSpecies.hpp
View File

@@ -16,7 +16,6 @@ namespace CreatureLib::Library {
GetProperty(float, GenderRate);
GetProperty(std::string, GrowthRate);
GetProperty(uint8_t, CaptureRate);
GetProperty(uint8_t, BaseHappiness);
private:
std::unordered_map<std::string, const SpeciesVariant*> _variants;
@@ -24,7 +23,7 @@ namespace CreatureLib::Library {
public:
CreatureSpecies(uint16_t id, std::string name, const SpeciesVariant* defaultVariant, float genderRatio,
std::string growthRate, uint8_t captureRate, uint8_t baseHappiness);
std::string growthRate, uint8_t captureRate);
~CreatureSpecies() {
for (auto v : _variants)