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

Change LibrarySettings to be a pointer instead of value, to allow for overriding in implementations.
All checks were successful
continuous-integration/drone/push Build is passing
Details

Browse Source
This commit is contained in:
Deukhoofd
2020-02-01 13:30:51 +01:00
parent 7e0a1ec033
commit dba271681d
7 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Library/DataLibrary.cpp
View File

@@ -1,6 +1,6 @@
#include "DataLibrary.hpp"
CreatureLib::Library::DataLibrary::DataLibrary(LibrarySettings settings, CreatureLib::Library::SpeciesLibrary* species,
CreatureLib::Library::DataLibrary::DataLibrary(LibrarySettings* settings, CreatureLib::Library::SpeciesLibrary* species,
CreatureLib::Library::AttackLibrary* attacks,
CreatureLib::Library::ItemLibrary* items,
CreatureLib::Library::GrowthRateLibrary* growthRates,
@@ -8,7 +8,7 @@ CreatureLib::Library::DataLibrary::DataLibrary(LibrarySettings settings, Creatur
: _settings(settings), _species(species), _attacks(attacks), _items(items), _growthRates(growthRates),
_typeLibrary(typeLibrary) {}
const CreatureLib::Library::LibrarySettings& CreatureLib::Library::DataLibrary::GetSettings() const {
const CreatureLib::Library::LibrarySettings* CreatureLib::Library::DataLibrary::GetSettings() const {
return _settings;
}

6
src/Library/DataLibrary.hpp
View File

@@ -14,7 +14,7 @@ namespace CreatureLib::Library {
*/
class DataLibrary {
private:
const LibrarySettings _settings;
const LibrarySettings* _settings;
const SpeciesLibrary* _species;
const AttackLibrary* _attacks;
const ItemLibrary* _items;
@@ -22,7 +22,7 @@ namespace CreatureLib::Library {
const TypeLibrary* _typeLibrary;
public:
DataLibrary(LibrarySettings settings, CreatureLib::Library::SpeciesLibrary* species,
DataLibrary(LibrarySettings* settings, CreatureLib::Library::SpeciesLibrary* species,
CreatureLib::Library::AttackLibrary* attacks, CreatureLib::Library::ItemLibrary* items,
CreatureLib::Library::GrowthRateLibrary* growthRates, TypeLibrary* typeLibrary);
@@ -34,7 +34,7 @@ namespace CreatureLib::Library {
delete _typeLibrary;
}
[[nodiscard]] const LibrarySettings& GetSettings() const;
[[nodiscard]] const LibrarySettings* GetSettings() const;
[[nodiscard]] const SpeciesLibrary* GetSpeciesLibrary() const;
[[nodiscard]] const AttackLibrary* GetAttackLibrary() const;
[[nodiscard]] const ItemLibrary* GetItemLibrary() const;