Browse Source

Use C++20 `using enum` instead of alias enum members manually

cpp20-using-enum
Gleb Mazovetskiy 3 years ago
parent
commit
5b187e63f6
  1. 8
      Source/misdat.cpp
  2. 7
      Source/objdat.cpp
  3. 6
      Source/spelldat.cpp

8
Source/misdat.cpp

@ -17,13 +17,7 @@
namespace devilution { namespace devilution {
namespace { namespace {
constexpr auto Physical = MissileDataFlags::Physical; using enum MissileDataFlags;
constexpr auto Fire = MissileDataFlags::Fire;
constexpr auto Lightning = MissileDataFlags::Lightning;
constexpr auto Magic = MissileDataFlags::Magic;
constexpr auto Acid = MissileDataFlags::Acid;
constexpr auto Arrow = MissileDataFlags::Arrow;
constexpr auto Invisible = MissileDataFlags::Invisible;
} // namespace } // namespace
/** Data related to each missile ID. */ /** Data related to each missile ID. */

7
Source/objdat.cpp

@ -159,12 +159,7 @@ const _object_id ObjTypeConv[] = {
}; };
namespace { namespace {
constexpr auto Animated = ObjectDataFlags::Animated; using enum ObjectDataFlags;
constexpr auto Solid = ObjectDataFlags::Solid;
constexpr auto MissilesPassThrough = ObjectDataFlags::MissilesPassThrough;
constexpr auto Light = ObjectDataFlags::Light;
constexpr auto Trap = ObjectDataFlags::Trap;
constexpr auto Breakable = ObjectDataFlags::Breakable;
} // namespace } // namespace
/** Contains the data related to each object ID. */ /** Contains the data related to each object ID. */

6
Source/spelldat.cpp

@ -9,11 +9,7 @@
namespace devilution { namespace devilution {
namespace { namespace {
const auto Fire = SpellDataFlags::Fire; using enum SpellDataFlags;
const auto Lightning = SpellDataFlags::Lightning;
const auto Magic = SpellDataFlags::Magic;
const auto Targeted = SpellDataFlags::Targeted;
const auto AllowedInTown = SpellDataFlags::AllowedInTown;
} // namespace } // namespace
/** Data related to each spell ID. */ /** Data related to each spell ID. */

Loading…
Cancel
Save