diff options
| author | Ben Longbons <b.r.longbons@gmail.com> | 2014-09-02 15:11:06 -0700 |
|---|---|---|
| committer | Ben Longbons <b.r.longbons@gmail.com> | 2014-09-30 13:49:26 -0700 |
| commit | 77563ec532c8b51134c3020fb3c70a8bed8457fb (patch) | |
| tree | 51e285a203956681a04b08257fa06f8b113a5981 /src/mmo | |
| parent | 0d3df507b4c4fe1dde086cd85a78179c8bcefcf9 (diff) | |
| download | tmwa-77563ec532c8b51134c3020fb3c70a8bed8457fb.tar.gz tmwa-77563ec532c8b51134c3020fb3c70a8bed8457fb.tar.bz2 tmwa-77563ec532c8b51134c3020fb3c70a8bed8457fb.tar.xz tmwa-77563ec532c8b51134c3020fb3c70a8bed8457fb.zip | |
Rename enum Option to Opt0
Diffstat (limited to 'src/mmo')
| -rw-r--r-- | src/mmo/enums.hpp | 10 | ||||
| -rw-r--r-- | src/mmo/extract_enums.hpp | 4 |
2 files changed, 7 insertions, 7 deletions
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; |