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

Fixed issues with C Interface
continuous-integration/drone/push Build is passing Details

This commit is contained in:
Deukhoofd 2020-05-02 20:03:18 +02:00
parent 2821eec263
commit 91ba93462b
Signed by: Deukhoofd
GPG Key ID: ADF2E9256009EDCE
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
CInterface/Library/SpeciesVariant.cpp
View File

@ -12,11 +12,11 @@ export SpeciesVariant* CreatureLib_SpeciesVariant_Construct(
auto talentsWrapped = Arbutils::Collections::List<ConstString>(talentsLength); auto talentsWrapped = Arbutils::Collections::List<ConstString>(talentsLength);
for (size_t i = 0; i < talentsLength; i++) { for (size_t i = 0; i < talentsLength; i++) {
talentsWrapped[i] = ConstString(talents[i]); talentsWrapped.Append(ConstString(talents[i]));
} }
auto secretTalentsWrapped = Arbutils::Collections::List<ConstString>(secretTalentsLength); auto secretTalentsWrapped = Arbutils::Collections::List<ConstString>(secretTalentsLength);
for (size_t i = 0; i < secretTalentsLength; i++) { for (size_t i = 0; i < secretTalentsLength; i++) {
secretTalentsWrapped[i] = ConstString(secretTalents[i]); secretTalentsWrapped.Append(ConstString(secretTalents[i]));
} }
return new SpeciesVariant(Arbutils::CaseInsensitiveConstString(name), height, weight, baseExperience, return new SpeciesVariant(Arbutils::CaseInsensitiveConstString(name), height, weight, baseExperience,
@ -38,7 +38,7 @@ SIMPLE_GET_FUNC(SpeciesVariant, GetWeight, float);
SIMPLE_GET_FUNC(SpeciesVariant, GetBaseExperience, uint32_t); SIMPLE_GET_FUNC(SpeciesVariant, GetBaseExperience, uint32_t);
SIMPLE_GET_FUNC(SpeciesVariant, GetTypeCount, size_t); SIMPLE_GET_FUNC(SpeciesVariant, GetTypeCount, size_t);
export uint8_t CreatureLib_SpeciesVariant_GetType(SpeciesVariant* p, size_t index) { return p->GetType(index); } export uint8_t CreatureLib_SpeciesVariant_GetType(SpeciesVariant* p, size_t index) { return p->GetType(index); }
export uint32_t CreatureLib_SpeciesVariant_GetStatistic(SpeciesVariant* p, CreatureLib::Library::Statistic stat) { export uint16_t CreatureLib_SpeciesVariant_GetStatistic(SpeciesVariant* p, CreatureLib::Library::Statistic stat) {
return p->GetStatistic(stat); return p->GetStatistic(stat);
} }
SIMPLE_GET_FUNC(SpeciesVariant, GetTalentCount, size_t); SIMPLE_GET_FUNC(SpeciesVariant, GetTalentCount, size_t);

2
src/Library/CreatureData/SpeciesVariant.cpp
View File

@ -8,7 +8,7 @@ size_t CreatureLib::Library::SpeciesVariant::GetTypeCount() const { return _type
uint8_t CreatureLib::Library::SpeciesVariant::GetType(size_t index) const { return _types[index]; } uint8_t CreatureLib::Library::SpeciesVariant::GetType(size_t index) const { return _types[index]; }
uint32_t CreatureLib::Library::SpeciesVariant::GetStatistic(CreatureLib::Library::Statistic stat) const { uint16_t CreatureLib::Library::SpeciesVariant::GetStatistic(CreatureLib::Library::Statistic stat) const {
return _baseStatistics.GetStat(stat); return _baseStatistics.GetStat(stat);
} }

2
src/Library/CreatureData/SpeciesVariant.hpp
View File

@ -44,7 +44,7 @@ namespace CreatureLib::Library {
[[nodiscard]] size_t GetTypeCount() const; [[nodiscard]] size_t GetTypeCount() const;
[[nodiscard]] uint8_t GetType(size_t index) const; [[nodiscard]] uint8_t GetType(size_t index) const;
[[nodiscard]] const List<uint8_t>& GetTypes() const; [[nodiscard]] const List<uint8_t>& GetTypes() const;
[[nodiscard]] uint32_t GetStatistic(Library::Statistic stat) const; [[nodiscard]] uint16_t GetStatistic(Library::Statistic stat) const;
[[nodiscard]] const size_t GetTalentCount() const { return _talents.Count(); } [[nodiscard]] const size_t GetTalentCount() const { return _talents.Count(); }
[[nodiscard]] const size_t GetSecretTalentCount() const { return _secretTalents.Count(); } [[nodiscard]] const size_t GetSecretTalentCount() const { return _secretTalents.Count(); }
[[nodiscard]] const ConstString& GetTalent(const TalentIndex& index) const { [[nodiscard]] const ConstString& GetTalent(const TalentIndex& index) const {