From 0ef909cf552b2bf8e80025861659f43fbee229d9 Mon Sep 17 00:00:00 2001 From: Deukhoofd Date: Thu, 13 Feb 2020 12:53:48 +0100 Subject: [PATCH] Use ENUM macro for ScriptCategory enum. --- src/Battling/ScriptHandling/ScriptResolver.hpp | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/src/Battling/ScriptHandling/ScriptResolver.hpp b/src/Battling/ScriptHandling/ScriptResolver.hpp index 88fb9e2..0bfaa66 100644 --- a/src/Battling/ScriptHandling/ScriptResolver.hpp +++ b/src/Battling/ScriptHandling/ScriptResolver.hpp @@ -2,6 +2,7 @@ #define CREATURELIB_SCRIPTRESOLVER_HPP #include +#include "../../Core/Enum.hpp" #include "Script.hpp" namespace CreatureLib::Battling { @@ -11,15 +12,7 @@ namespace CreatureLib::Battling { public: virtual ~ScriptResolver() = default; - enum class ScriptCategory { - Attack, - Talent, - Status, - Creature, - Battle, - Side, - - }; + ENUM(ScriptCategory, uint8_t, Attack, Talent, Status, Creature, Battle, Side) virtual void Initialize(BattleLibrary* library){}; virtual Script* LoadScript(ScriptCategory category, const std::string& scriptName) { return nullptr; };