summaryrefslogtreecommitdiff
path: root/src/login
diff options
context:
space:
mode:
authorBen Longbons <b.r.longbons@gmail.com>2014-06-10 15:31:24 -0700
committerBen Longbons <b.r.longbons@gmail.com>2014-06-23 21:07:14 -0700
commit1c1752f40aac20bf9a5e56817951a013c2219bed (patch)
treed4ca348dd88ec08cf4edbdd37b72396b75a914a4 /src/login
parent8ce2f240dba5bdd0ca47ac25f16f140d8d1744fc (diff)
downloadtmwa-1c1752f40aac20bf9a5e56817951a013c2219bed.tar.gz
tmwa-1c1752f40aac20bf9a5e56817951a013c2219bed.tar.bz2
tmwa-1c1752f40aac20bf9a5e56817951a013c2219bed.tar.xz
tmwa-1c1752f40aac20bf9a5e56817951a013c2219bed.zip
Generate the map server protocol
Sigh, map server will have no smart filters yet
Diffstat (limited to 'src/login')
-rw-r--r--src/login/login.cpp2
-rw-r--r--src/login/login.hpp2
-rw-r--r--src/login/login.t.hpp (renamed from src/login/types.hpp)8
-rw-r--r--src/login/types.cpp21
4 files changed, 6 insertions, 27 deletions
diff --git a/src/login/login.cpp b/src/login/login.cpp
index 8d893f9..6edaeef 100644
--- a/src/login/login.cpp
+++ b/src/login/login.cpp
@@ -69,8 +69,6 @@
#include "../proto2/login-char.hpp"
#include "../proto2/login-user.hpp"
-#include "types.hpp"
-
#include "../poison.hpp"
constexpr int MAX_SERVERS = 30;
diff --git a/src/login/login.hpp b/src/login/login.hpp
index 9c17c55..dc817cc 100644
--- a/src/login/login.hpp
+++ b/src/login/login.hpp
@@ -21,4 +21,6 @@
# include "fwd.hpp"
+# include "login.t.hpp"
+
#endif // TMWA_LOGIN_LOGIN_HPP
diff --git a/src/login/types.hpp b/src/login/login.t.hpp
index ef12f36..b49fc4b 100644
--- a/src/login/types.hpp
+++ b/src/login/login.t.hpp
@@ -1,6 +1,6 @@
-#ifndef TMWA_LOGIN_TYPES_HPP
-#define TMWA_LOGIN_TYPES_HPP
-// types.hpp - externally useful types from login
+#ifndef TMWA_LOGIN_LOGIN_T_HPP
+#define TMWA_LOGIN_LOGIN_T_HPP
+// login.t.hpp - externally useful types from login
//
// Copyright © ????-2004 Athena Dev Teams
// Copyright © 2004-2011 The Mana World Development Team
@@ -40,4 +40,4 @@ ENUM_BITWISE_OPERATORS(VERSION_2)
}
using e::VERSION_2;
-#endif // TMWA_LOGIN_TYPES_HPP
+#endif // TMWA_LOGIN_LOGIN_T_HPP
diff --git a/src/login/types.cpp b/src/login/types.cpp
deleted file mode 100644
index 854220b..0000000
--- a/src/login/types.cpp
+++ /dev/null
@@ -1,21 +0,0 @@
-#include "types.hpp"
-// types.cpp - externally useful types from login
-//
-// Copyright © 2014 Ben Longbons <b.r.longbons@gmail.com>
-//
-// This file is part of The Mana World (Athena server)
-//
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program. If not, see <http://www.gnu.org/licenses/>.
-
-#include "../poison.hpp"