From 937071df595830ca456045db063843cd553cb001 Mon Sep 17 00:00:00 2001 From: Deukhoofd Date: Sat, 4 Apr 2020 13:40:14 +0200 Subject: [PATCH] Revert commited out battlelibrary changes. --- CInterface/Battling/BattleLibrary.cpp | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/CInterface/Battling/BattleLibrary.cpp b/CInterface/Battling/BattleLibrary.cpp index b43e11e..3967b3a 100644 --- a/CInterface/Battling/BattleLibrary.cpp +++ b/CInterface/Battling/BattleLibrary.cpp @@ -8,9 +8,7 @@ export const BattleLibrary* CreatureLib_BattleLibrary_Construct(const CreatureLi ExperienceLibrary* experienceLibrary, ScriptResolver* scriptResolver, MiscLibrary* miscLibrary) { - return nullptr; - // return new BattleLibrary(staticLib, statCalculator, damageLibrary, experienceLibrary, scriptResolver, - // miscLibrary); + return new BattleLibrary(staticLib, statCalculator, damageLibrary, experienceLibrary, scriptResolver, miscLibrary); } export void CreatureLib_BattleLibrary_Destruct(const BattleLibrary* p) { delete p; } @@ -19,9 +17,9 @@ export void CreatureLib_BattleLibrary_Destruct(const BattleLibrary* p) { delete export returnType CreatureLib_##type##_##name(const type* p) { return p->name(); } SIMPLE_GET_FUNC(BattleLibrary, GetStaticLib, const CreatureLib::Library::DataLibrary*); -// SIMPLE_GET_FUNC(BattleLibrary, GetStatCalculator, const BattleStatCalculator*); -// SIMPLE_GET_FUNC(BattleLibrary, GetDamageLibrary, const DamageLibrary*); -// SIMPLE_GET_FUNC(BattleLibrary, GetMiscLibrary, const MiscLibrary*); -// SIMPLE_GET_FUNC(BattleLibrary, GetExperienceLibrary, const ExperienceLibrary*); +SIMPLE_GET_FUNC(BattleLibrary, GetStatCalculator, const BattleStatCalculator*); +SIMPLE_GET_FUNC(BattleLibrary, GetDamageLibrary, const DamageLibrary*); +SIMPLE_GET_FUNC(BattleLibrary, GetMiscLibrary, const MiscLibrary*); +SIMPLE_GET_FUNC(BattleLibrary, GetExperienceLibrary, const ExperienceLibrary*); #undef SIMPLE_GET_FUNC \ No newline at end of file