Use smart pointers for basic libraries.
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:
@@ -1,6 +1,7 @@
|
||||
#ifndef CREATURELIB_DATALIBRARY_HPP
|
||||
#define CREATURELIB_DATALIBRARY_HPP
|
||||
|
||||
#include <memory>
|
||||
#include "AttackLibrary.hpp"
|
||||
#include "GrowthRates/GrowthRateLibrary.hpp"
|
||||
#include "ItemLibrary.hpp"
|
||||
@@ -14,32 +15,31 @@ namespace CreatureLib::Library {
|
||||
*/
|
||||
class DataLibrary {
|
||||
private:
|
||||
const LibrarySettings* _settings;
|
||||
const SpeciesLibrary* _species;
|
||||
const AttackLibrary* _attacks;
|
||||
const ItemLibrary* _items;
|
||||
const GrowthRateLibrary* _growthRates;
|
||||
const TypeLibrary* _typeLibrary;
|
||||
const std::unique_ptr<const LibrarySettings> _settings;
|
||||
const std::unique_ptr<const SpeciesLibrary> _species;
|
||||
const std::unique_ptr<const AttackLibrary> _attacks;
|
||||
const std::unique_ptr<const ItemLibrary> _items;
|
||||
const std::unique_ptr<const GrowthRateLibrary> _growthRates;
|
||||
const std::unique_ptr<const TypeLibrary> _typeLibrary;
|
||||
|
||||
public:
|
||||
DataLibrary(LibrarySettings* settings, CreatureLib::Library::SpeciesLibrary* species,
|
||||
CreatureLib::Library::AttackLibrary* attacks, CreatureLib::Library::ItemLibrary* items,
|
||||
CreatureLib::Library::GrowthRateLibrary* growthRates, TypeLibrary* typeLibrary);
|
||||
DataLibrary(std::unique_ptr<const LibrarySettings> settings, std::unique_ptr<const SpeciesLibrary> species,
|
||||
std::unique_ptr<const AttackLibrary> attacks, std::unique_ptr<const ItemLibrary> items,
|
||||
std::unique_ptr<const GrowthRateLibrary> growthRates,
|
||||
std::unique_ptr<const TypeLibrary> typeLibrary);
|
||||
|
||||
virtual ~DataLibrary() {
|
||||
delete _species;
|
||||
delete _attacks;
|
||||
delete _items;
|
||||
delete _growthRates;
|
||||
delete _typeLibrary;
|
||||
virtual ~DataLibrary() {}
|
||||
|
||||
[[nodiscard]] const std::unique_ptr<const LibrarySettings>& GetSettings() const noexcept { return _settings; }
|
||||
[[nodiscard]] const std::unique_ptr<const SpeciesLibrary>& GetSpeciesLibrary() const noexcept {
|
||||
return _species;
|
||||
}
|
||||
|
||||
[[nodiscard]] const LibrarySettings* GetSettings() const noexcept;
|
||||
[[nodiscard]] const SpeciesLibrary* GetSpeciesLibrary() const noexcept;
|
||||
[[nodiscard]] const AttackLibrary* GetAttackLibrary() const noexcept;
|
||||
[[nodiscard]] const ItemLibrary* GetItemLibrary() const noexcept;
|
||||
[[nodiscard]] const GrowthRateLibrary* GetGrowthRates() const noexcept;
|
||||
[[nodiscard]] const TypeLibrary* GetTypeLibrary() const noexcept;
|
||||
[[nodiscard]] const std::unique_ptr<const AttackLibrary>& GetAttackLibrary() const noexcept { return _attacks; }
|
||||
[[nodiscard]] const std::unique_ptr<const ItemLibrary>& GetItemLibrary() const noexcept { return _items; }
|
||||
[[nodiscard]] const std::unique_ptr<const GrowthRateLibrary>& GetGrowthRates() const noexcept {
|
||||
return _growthRates;
|
||||
}
|
||||
[[nodiscard]] const std::unique_ptr<const TypeLibrary>& GetTypeLibrary() const noexcept { return _typeLibrary; }
|
||||
};
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user