summaryrefslogtreecommitdiff
path: root/src/mmo/mmo.hpp
diff options
context:
space:
mode:
authorBen Longbons <b.r.longbons@gmail.com>2014-04-24 16:13:40 -0700
committerBen Longbons <b.r.longbons@gmail.com>2014-04-24 16:49:05 -0700
commitc093f4cce643e245ab2048e0782237744208eb9f (patch)
treeedcfb0fbdd57acc1df658d30fe4c87663d938044 /src/mmo/mmo.hpp
parent5cbd4c728046b4b12d289bf9b7edbc2c7b589fca (diff)
downloadtmwa-c093f4cce643e245ab2048e0782237744208eb9f.tar.gz
tmwa-c093f4cce643e245ab2048e0782237744208eb9f.tar.bz2
tmwa-c093f4cce643e245ab2048e0782237744208eb9f.tar.xz
tmwa-c093f4cce643e245ab2048e0782237744208eb9f.zip
Header cleanup
Diffstat (limited to 'src/mmo/mmo.hpp')
-rw-r--r--src/mmo/mmo.hpp17
1 files changed, 3 insertions, 14 deletions
diff --git a/src/mmo/mmo.hpp b/src/mmo/mmo.hpp
index fdfc478..15c3fa5 100644
--- a/src/mmo/mmo.hpp
+++ b/src/mmo/mmo.hpp
@@ -23,10 +23,13 @@
# include "fwd.hpp"
+# include <algorithm>
+
# include "../compat/memory.hpp"
# include "../strings/vstring.hpp"
+# include "../generic/array.hpp"
# include "../generic/enum.hpp"
# include "ids.hpp"
@@ -64,20 +67,6 @@ constexpr int MAX_PARTY = 12;
# define MIN_CLOTH_COLOR battle_config.min_cloth_color
# define MAX_CLOTH_COLOR battle_config.max_cloth_color
-template<class T, size_t n>
-struct Array
-{
- T data[n];
-public:
- T& operator [](size_t i) { assert (i < n); return data[i]; }
- const T& operator [](size_t i) const { assert (i < n); return data[i]; }
-
- T *begin() { return data + 0; }
- T *end() { return data + n; }
- const T *begin() const { return data + 0; }
- const T *end() const { return data + n; }
-};
-
struct AccountName : VString<23> {};
struct AccountPass : VString<23> {};
struct AccountCrypt : VString<39> {};