From 77563ec532c8b51134c3020fb3c70a8bed8457fb Mon Sep 17 00:00:00 2001 From: Ben Longbons Date: Tue, 2 Sep 2014 15:11:06 -0700 Subject: Rename enum Option to Opt0 --- src/mmo/enums.hpp | 10 +++++----- src/mmo/extract_enums.hpp | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) (limited to 'src/mmo') diff --git a/src/mmo/enums.hpp b/src/mmo/enums.hpp index bf8a75c..1cfa245 100644 --- a/src/mmo/enums.hpp +++ b/src/mmo/enums.hpp @@ -66,14 +66,14 @@ enum class SkillFlags : uint16_t; } using e::SkillFlags; -// Option and Opt1..3 in map.hpp +// Opt0 and Opt1..3 in map.hpp namespace e { -enum class Option : uint16_t; -constexpr Option get_enum_min_value(Option) { return Option(0x0000); } -constexpr Option get_enum_max_value(Option) { return Option(0xffff); } +enum class Opt0 : uint16_t; +constexpr Opt0 get_enum_min_value(Opt0) { return Opt0(0x0000); } +constexpr Opt0 get_enum_max_value(Opt0) { return Opt0(0xffff); } } -using e::Option; +using e::Opt0; enum class ATTR { diff --git a/src/mmo/extract_enums.hpp b/src/mmo/extract_enums.hpp index 613fae9..60ad493 100644 --- a/src/mmo/extract_enums.hpp +++ b/src/mmo/extract_enums.hpp @@ -33,7 +33,7 @@ enum class EPOS : uint16_t; enum class MobMode : uint16_t; enum class Opt1 : uint16_t; enum class Opt2 : uint16_t; -enum class Option : uint16_t; +enum class Opt0 : uint16_t; inline bool extract(XString str, EPOS *iv) { return extract_as_int(str, iv); } @@ -44,7 +44,7 @@ bool extract(XString str, Opt1 *iv) { return extract_as_int(str, iv); } inline bool extract(XString str, Opt2 *iv) { return extract_as_int(str, iv); } inline -bool extract(XString str, Option *iv) { return extract_as_int(str, iv); } +bool extract(XString str, Opt0 *iv) { return extract_as_int(str, iv); } } enum class ItemLook : uint16_t; -- cgit v1.2.3-70-g09d2