From d61977d758af62c081bd86dfbf7a9238fd2fc584 Mon Sep 17 00:00:00 2001 From: William JCM Date: Fri, 11 Mar 2022 15:39:49 +0100 Subject: [PATCH] Weapon: change how enums are built. --- src/Mass/Weapon.h | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) diff --git a/src/Mass/Weapon.h b/src/Mass/Weapon.h index bcbdff6..7fc8c45 100644 --- a/src/Mass/Weapon.h +++ b/src/Mass/Weapon.h @@ -29,28 +29,19 @@ using namespace Corrade; using namespace Magnum; +#define c(enumerator, ...) enumerator, enum class WeaponType { - Melee = 0, - Shield = 5, - BulletShooter = 1, - EnergyShooter = 2, - BulletLauncher = 3, - EnergyLauncher = 4, + #include "../Maps/WeaponTypes.hpp" }; enum class DamageType { - Physical = 0, - Piercing = 1, - Plasma = 5, - Heat = 2, - Freeze = 3, - Shock = 4, + #include "../Maps/DamageTypes.hpp" }; enum class EffectColourMode { - Default = 0, - Custom = 1, + #include "../Maps/EffectColourModes.hpp" }; +#undef c struct Weapon { Weapon() = default;