From 1c1752f40aac20bf9a5e56817951a013c2219bed Mon Sep 17 00:00:00 2001 From: Ben Longbons Date: Tue, 10 Jun 2014 15:31:24 -0700 Subject: Generate the map server protocol Sigh, map server will have no smart filters yet --- src/login/login.cpp | 2 -- src/login/login.hpp | 2 ++ src/login/login.t.hpp | 43 +++++++++++++++++++++++++++++++++++++++++++ src/login/types.cpp | 21 --------------------- src/login/types.hpp | 43 ------------------------------------------- 5 files changed, 45 insertions(+), 66 deletions(-) create mode 100644 src/login/login.t.hpp delete mode 100644 src/login/types.cpp delete mode 100644 src/login/types.hpp (limited to 'src/login') 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/login.t.hpp b/src/login/login.t.hpp new file mode 100644 index 0000000..b49fc4b --- /dev/null +++ b/src/login/login.t.hpp @@ -0,0 +1,43 @@ +#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 +// Copyright © 2011-2014 Ben Longbons +// +// 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 . + +# include "fwd.hpp" + +# include + +# include "../generic/enum.hpp" + +namespace e +{ +enum class VERSION_2 : uint8_t +{ + /// client supports updatehost + UPDATEHOST = 0x01, + /// send servers in forward order + SERVERORDER = 0x02, +}; +ENUM_BITWISE_OPERATORS(VERSION_2) +} +using e::VERSION_2; + +#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 -// -// 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 . - -#include "../poison.hpp" diff --git a/src/login/types.hpp b/src/login/types.hpp deleted file mode 100644 index ef12f36..0000000 --- a/src/login/types.hpp +++ /dev/null @@ -1,43 +0,0 @@ -#ifndef TMWA_LOGIN_TYPES_HPP -#define TMWA_LOGIN_TYPES_HPP -// types.hpp - externally useful types from login -// -// Copyright © ????-2004 Athena Dev Teams -// Copyright © 2004-2011 The Mana World Development Team -// Copyright © 2011-2014 Ben Longbons -// -// 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 . - -# include "fwd.hpp" - -# include - -# include "../generic/enum.hpp" - -namespace e -{ -enum class VERSION_2 : uint8_t -{ - /// client supports updatehost - UPDATEHOST = 0x01, - /// send servers in forward order - SERVERORDER = 0x02, -}; -ENUM_BITWISE_OPERATORS(VERSION_2) -} -using e::VERSION_2; - -#endif // TMWA_LOGIN_TYPES_HPP -- cgit v1.2.3-70-g09d2