Smart pointers for most library and battle classes.
All checks were successful
continuous-integration/drone/push Build is passing
All checks were successful
continuous-integration/drone/push Build is passing
This commit is contained in:
@@ -2,12 +2,15 @@
|
||||
#define PKMNLIB_EVOLUTIONDATA_HPP
|
||||
|
||||
#include <Arbutils/Collections/List.hpp>
|
||||
#include <Arbutils/Memory/BorrowedPtr.hpp>
|
||||
#include <Arbutils/Memory/UniquePtrList.hpp>
|
||||
#include <CreatureLib/Library/EffectParameter.hpp>
|
||||
#include <CreatureLib/Library/Gender.hpp>
|
||||
#include <string>
|
||||
#include <utility>
|
||||
#include "../TimeOfDay.hpp"
|
||||
#include "EvolutionMethod.hpp"
|
||||
|
||||
namespace PkmnLib::Library {
|
||||
class PokemonSpecies;
|
||||
class MoveData;
|
||||
@@ -15,20 +18,16 @@ namespace PkmnLib::Library {
|
||||
|
||||
class EvolutionData {
|
||||
private:
|
||||
const PokemonSpecies* _evolvesInto;
|
||||
ArbUt::BorrowedPtr<const PokemonSpecies> _evolvesInto;
|
||||
EvolutionMethod _method;
|
||||
ArbUt::List<const CreatureLib::Library::EffectParameter*> _evolutionData;
|
||||
ArbUt::UniquePtrList<const CreatureLib::Library::EffectParameter> _evolutionData;
|
||||
|
||||
EvolutionData(EvolutionMethod method, ArbUt::List<const CreatureLib::Library::EffectParameter*> data,
|
||||
EvolutionData(EvolutionMethod method, std::vector<const CreatureLib::Library::EffectParameter*> data,
|
||||
const PokemonSpecies* next)
|
||||
: _evolvesInto(next), _method(method), _evolutionData(std::move(data)) {}
|
||||
|
||||
public:
|
||||
~EvolutionData() {
|
||||
for (auto v : _evolutionData) {
|
||||
delete v;
|
||||
}
|
||||
}
|
||||
~EvolutionData() = default;
|
||||
|
||||
static inline const EvolutionData* CreateLevelEvolution(uint8_t level, const PokemonSpecies* into) {
|
||||
return new EvolutionData(EvolutionMethod::Level,
|
||||
@@ -67,15 +66,18 @@ namespace PkmnLib::Library {
|
||||
static const EvolutionData* CreateTradeWithSpeciesEvolution(const PokemonSpecies* traded,
|
||||
const PokemonSpecies* into);
|
||||
static inline const EvolutionData*
|
||||
CreateCustomEvolution(const ArbUt::List<const CreatureLib::Library::EffectParameter*>& data,
|
||||
CreateCustomEvolution(const std::vector<const CreatureLib::Library::EffectParameter*>& data,
|
||||
const PokemonSpecies* into) {
|
||||
return new EvolutionData(EvolutionMethod::Custom, data, into);
|
||||
}
|
||||
|
||||
[[nodiscard]] inline const PokemonSpecies* GetNewSpecies() const noexcept { return _evolvesInto; }
|
||||
[[nodiscard]] inline ArbUt::BorrowedPtr<const PokemonSpecies> GetNewSpecies() const noexcept {
|
||||
return _evolvesInto;
|
||||
}
|
||||
[[nodiscard]] inline EvolutionMethod GetMethod() const noexcept { return _method; }
|
||||
[[nodiscard]] inline size_t GetDataCount() const noexcept { return _evolutionData.Count(); }
|
||||
[[nodiscard]] inline const CreatureLib::Library::EffectParameter* GetData(size_t index) const {
|
||||
[[nodiscard]] inline ArbUt::BorrowedPtr<const CreatureLib::Library::EffectParameter>
|
||||
GetData(size_t index) const {
|
||||
return _evolutionData.At(index);
|
||||
}
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user