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

Changes for EffectParameter type in AngelScript, fixes for ConstString memory leak in AngelScript.
All checks were successful
continuous-integration/drone/push Build is passing
Details

Browse Source
This commit is contained in:
Deukhoofd
2020-04-16 14:25:20 +02:00
parent 2ab9445b71
commit c11da2d966
8 changed files with 105 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -8,7 +8,7 @@ namespace PkmnLib::Library {
class PokemonSpecies : public CreatureLib::Library::CreatureSpecies {
private:
uint8_t _baseHappiness;
std::vector<EvolutionData> _evolutions;
std::vector<const EvolutionData*> _evolutions;
public:
PokemonSpecies(uint16_t id, const Arbutils::CaseInsensitiveConstString& name,
@@ -18,7 +18,11 @@ namespace PkmnLib::Library {
: CreatureSpecies(id, name, defaultVariant, genderRatio, growthRate, captureRate),
_baseHappiness(baseHappiness) {}
~PokemonSpecies() override = default;
~PokemonSpecies() override {
for (auto evo : _evolutions) {
delete evo;
}
}
inline uint8_t GetBaseHappiness() const { return _baseHappiness; }
@@ -36,8 +40,8 @@ namespace PkmnLib::Library {
return reinterpret_cast<const PokemonForme*>(CreatureSpecies::GetVariant(key));
}
inline void AddEvolution(const EvolutionData& data) { _evolutions.push_back(data); }
const std::vector<EvolutionData>& GetEvolutions() const { return _evolutions; }
inline void AddEvolution(const EvolutionData* data) { _evolutions.push_back(data); }
const std::vector<const EvolutionData*>& GetEvolutions() const { return _evolutions; }
};
}