summaryrefslogtreecommitdiff
path: root/src/mmo/ids.hpp
diff options
context:
space:
mode:
authorBen Longbons <b.r.longbons@gmail.com>2014-04-22 17:14:28 -0700
committerBen Longbons <b.r.longbons@gmail.com>2014-04-22 17:57:08 -0700
commit1cc5fee5904832da6564f12c858423fd5bd1b2b6 (patch)
treef9318cdd5f45acdd1aceef875de20a0c5b9bde6b /src/mmo/ids.hpp
parentb195ac27e8234160b29698802deccd109a6fdc25 (diff)
downloadtmwa-1cc5fee5904832da6564f12c858423fd5bd1b2b6.tar.gz
tmwa-1cc5fee5904832da6564f12c858423fd5bd1b2b6.tar.bz2
tmwa-1cc5fee5904832da6564f12c858423fd5bd1b2b6.tar.xz
tmwa-1cc5fee5904832da6564f12c858423fd5bd1b2b6.zip
Make travis happy
Diffstat (limited to 'src/mmo/ids.hpp')
-rw-r--r--src/mmo/ids.hpp20
1 files changed, 10 insertions, 10 deletions
diff --git a/src/mmo/ids.hpp b/src/mmo/ids.hpp
index 71164ff..3c5b1ba 100644
--- a/src/mmo/ids.hpp
+++ b/src/mmo/ids.hpp
@@ -25,13 +25,13 @@
# include "extract.hpp"
-class Species : public Wrapped<uint16_t> { public: explicit operator bool() const = delete; bool operator !() const = delete; Species() : Wrapped<uint16_t>() {} protected: template<class... A> constexpr explicit Species(A... a) : Wrapped<uint16_t>(a...) {} };
+class Species : public Wrapped<uint16_t> { public: explicit operator bool() const = delete; bool operator !() const = delete; Species() : Wrapped<uint16_t>() {} protected: constexpr explicit Species(uint16_t a) : Wrapped<uint16_t>(a) {} };
-class AccountId : public Wrapped<uint32_t> { public: AccountId() : Wrapped<uint32_t>() {} protected: template<class... A> constexpr explicit AccountId(A... a) : Wrapped<uint32_t>(a...) {} };
-class CharId : public Wrapped<uint32_t> { public: CharId() : Wrapped<uint32_t>() {} protected: template<class... A> constexpr explicit CharId(A... a) : Wrapped<uint32_t>(a...) {} };
+class AccountId : public Wrapped<uint32_t> { public: AccountId() : Wrapped<uint32_t>() {} protected: constexpr explicit AccountId(uint32_t a) : Wrapped<uint32_t>(a) {} };
+class CharId : public Wrapped<uint32_t> { public: CharId() : Wrapped<uint32_t>() {} protected: constexpr explicit CharId(uint32_t a) : Wrapped<uint32_t>(a) {} };
// important note: slave mobs synthesize PartyId as -BlockId of master
-class PartyId : public Wrapped<uint32_t> { public: PartyId() : Wrapped<uint32_t>() {} protected: template<class... A> constexpr explicit PartyId(A... a) : Wrapped<uint32_t>(a...) {} };
-class ItemNameId : public Wrapped<uint16_t> { public: ItemNameId() : Wrapped<uint16_t>() {} protected: template<class... A> constexpr explicit ItemNameId(A... a) : Wrapped<uint16_t>(a...) {} };
+class PartyId : public Wrapped<uint32_t> { public: PartyId() : Wrapped<uint32_t>() {} protected: constexpr explicit PartyId(uint32_t a) : Wrapped<uint32_t>(a) {} };
+class ItemNameId : public Wrapped<uint16_t> { public: ItemNameId() : Wrapped<uint16_t>() {} protected: constexpr explicit ItemNameId(uint16_t a) : Wrapped<uint16_t>(a) {} };
class GmLevel
{
@@ -41,7 +41,7 @@ class GmLevel
constexpr explicit
GmLevel(uint32_t b) : bits(b) {}
constexpr explicit
- operator uint32_t() { return bits; }
+ operator uint32_t() const { return bits; }
template<class T>
explicit
@@ -65,16 +65,16 @@ public:
// the argument is the level of a command
constexpr
- bool satisfies(GmLevel perm) { return bits >= perm.bits; }
+ bool satisfies(GmLevel perm) const { return bits >= perm.bits; }
// the argument is another player's gm level, for info commands
constexpr
- bool detects(GmLevel other) { return bits >= other.bits; }
+ bool detects(GmLevel other) const { return bits >= other.bits; }
// the argument is another player's gm level, for aggressive commands
constexpr
- bool overwhelms(GmLevel other) { return bits >= other.bits; }
+ bool overwhelms(GmLevel other) const { return bits >= other.bits; }
// the argument is another potential permission level
constexpr
- bool obsoletes(GmLevel plvl) { return bits >= plvl.bits; }
+ bool obsoletes(GmLevel plvl) const { return bits >= plvl.bits; }
constexpr
uint16_t get_public_word() const