From d75ab9a77c15b7a99dcd5051846e4978c3ab71c1 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Tue, 20 May 2014 22:41:20 +0300 Subject: Move player attributes in net code into separate file. --- src/CMakeLists.txt | 2 ++ src/Makefile.am | 2 ++ src/net/eathena/attrs.h | 52 +++++++++++++++++++++++++++++++++++ src/net/eathena/charserverhandler.cpp | 1 + src/net/eathena/generalhandler.cpp | 1 + src/net/eathena/playerhandler.cpp | 1 + src/net/eathena/protocol.h | 26 ------------------ src/net/tmwa/attrs.h | 52 +++++++++++++++++++++++++++++++++++ src/net/tmwa/charserverhandler.cpp | 1 + src/net/tmwa/generalhandler.cpp | 1 + src/net/tmwa/playerhandler.cpp | 1 + src/net/tmwa/protocol.h | 26 ------------------ 12 files changed, 114 insertions(+), 52 deletions(-) create mode 100644 src/net/eathena/attrs.h create mode 100644 src/net/tmwa/attrs.h (limited to 'src') diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index e3ea05e01..cc771d49b 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1032,6 +1032,7 @@ SET(SRCS_TMWA net/tmwa/gui/partytab.h net/tmwa/adminhandler.cpp net/tmwa/adminhandler.h + net/tmwa/attrs.h net/tmwa/beinghandler.cpp net/tmwa/beinghandler.h net/tmwa/buysellhandler.cpp @@ -1085,6 +1086,7 @@ SET(SRCS_EATHENA net/eathena/gui/partytab.h net/eathena/adminhandler.cpp net/eathena/adminhandler.h + net/eathena/attrs.h net/eathena/beinghandler.cpp net/eathena/beinghandler.h net/eathena/buysellhandler.cpp diff --git a/src/Makefile.am b/src/Makefile.am index 57725d8e4..1f1e24f2f 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1081,6 +1081,7 @@ manaplus_SOURCES += \ net/tmwa/gui/partytab.h \ net/tmwa/adminhandler.cpp \ net/tmwa/adminhandler.h \ + net/tmwa/attrs.h \ net/tmwa/beinghandler.cpp \ net/tmwa/beinghandler.h \ net/tmwa/buysellhandler.cpp \ @@ -1134,6 +1135,7 @@ manaplus_SOURCES += net/eathena/gui/guildtab.cpp \ net/eathena/gui/partytab.h \ net/eathena/adminhandler.cpp \ net/eathena/adminhandler.h \ + net/eathena/attrs.h \ net/eathena/beinghandler.cpp \ net/eathena/beinghandler.h \ net/eathena/buysellhandler.cpp \ diff --git a/src/net/eathena/attrs.h b/src/net/eathena/attrs.h new file mode 100644 index 000000000..dc3108ce0 --- /dev/null +++ b/src/net/eathena/attrs.h @@ -0,0 +1,52 @@ +/* + * The ManaPlus Client + * Copyright (C) 2004-2009 The Mana World Development Team + * Copyright (C) 2009-2010 The Mana Developers + * Copyright (C) 2011-2014 The ManaPlus Developers + * + * This file is part of The ManaPlus Client. + * + * 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 2 of the License, or + * 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 . + */ + +#ifndef NET_EATHENA_ATTRS_H +#define NET_EATHENA_ATTRS_H + +namespace EAthena +{ + enum + { + JOB = 0xa, + + STR = 0xd, + AGI, + VIT, + INT, + DEX, + LUK, + + ATK, + DEF, + MATK, + MDEF, + HIT, + FLEE, + CRIT + +// KARMA, +// MANNER + }; +} // namespace EAthena + +#endif // NET_EATHENA_PROTOCOL_H diff --git a/src/net/eathena/charserverhandler.cpp b/src/net/eathena/charserverhandler.cpp index 15a122b9e..47629c3dc 100644 --- a/src/net/eathena/charserverhandler.cpp +++ b/src/net/eathena/charserverhandler.cpp @@ -31,6 +31,7 @@ #include "net/logindata.h" #include "net/net.h" +#include "net/eathena/attrs.h" #include "net/eathena/loginhandler.h" #include "net/eathena/messageout.h" #include "net/eathena/network.h" diff --git a/src/net/eathena/generalhandler.cpp b/src/net/eathena/generalhandler.cpp index 7768a1571..ea4444ea7 100644 --- a/src/net/eathena/generalhandler.cpp +++ b/src/net/eathena/generalhandler.cpp @@ -39,6 +39,7 @@ #include "net/ea/gui/partytab.h" #include "net/eathena/adminhandler.h" +#include "net/eathena/attrs.h" #include "net/eathena/beinghandler.h" #include "net/eathena/buysellhandler.h" #include "net/eathena/chathandler.h" diff --git a/src/net/eathena/playerhandler.cpp b/src/net/eathena/playerhandler.cpp index 17c8a6a41..2aad363c0 100644 --- a/src/net/eathena/playerhandler.cpp +++ b/src/net/eathena/playerhandler.cpp @@ -26,6 +26,7 @@ #include "net/net.h" +#include "net/eathena/attrs.h" #include "net/eathena/messageout.h" #include "net/eathena/protocol.h" #include "net/eathena/inventoryhandler.h" diff --git a/src/net/eathena/protocol.h b/src/net/eathena/protocol.h index 598f62101..2479efa08 100644 --- a/src/net/eathena/protocol.h +++ b/src/net/eathena/protocol.h @@ -23,32 +23,6 @@ #ifndef NET_EATHENA_PROTOCOL_H #define NET_EATHENA_PROTOCOL_H -namespace EAthena -{ - enum - { - JOB = 0xa, - - STR = 0xd, - AGI, - VIT, - INT, - DEX, - LUK, - - ATK, - DEF, - MATK, - MDEF, - HIT, - FLEE, - CRIT - -// KARMA, -// MANNER - }; -} // namespace EAthena - /********************************* * Packets from server to client * *********************************/ diff --git a/src/net/tmwa/attrs.h b/src/net/tmwa/attrs.h new file mode 100644 index 000000000..98c135ee1 --- /dev/null +++ b/src/net/tmwa/attrs.h @@ -0,0 +1,52 @@ +/* + * The ManaPlus Client + * Copyright (C) 2004-2009 The Mana World Development Team + * Copyright (C) 2009-2010 The Mana Developers + * Copyright (C) 2011-2014 The ManaPlus Developers + * + * This file is part of The ManaPlus Client. + * + * 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 2 of the License, or + * 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 . + */ + +#ifndef NET_TMWA_ATTRS_H +#define NET_TMWA_ATTRS_H + +namespace TmwAthena +{ + enum + { + JOB = 0xa, + + STR = 0xd, + AGI, + VIT, + INT, + DEX, + LUK, + + ATK, + DEF, + MATK, + MDEF, + HIT, + FLEE, + CRIT + +// KARMA, +// MANNER + }; +} // namespace TmwAthena + +#endif // NET_TMWA_ATTRS_H diff --git a/src/net/tmwa/charserverhandler.cpp b/src/net/tmwa/charserverhandler.cpp index 256f30296..04c1d4928 100644 --- a/src/net/tmwa/charserverhandler.cpp +++ b/src/net/tmwa/charserverhandler.cpp @@ -31,6 +31,7 @@ #include "net/logindata.h" #include "net/net.h" +#include "net/tmwa/attrs.h" #include "net/tmwa/loginhandler.h" #include "net/tmwa/messageout.h" #include "net/tmwa/network.h" diff --git a/src/net/tmwa/generalhandler.cpp b/src/net/tmwa/generalhandler.cpp index 32f6c37ed..57b8ee6d5 100644 --- a/src/net/tmwa/generalhandler.cpp +++ b/src/net/tmwa/generalhandler.cpp @@ -39,6 +39,7 @@ #include "net/ea/gui/partytab.h" #include "net/tmwa/adminhandler.h" +#include "net/tmwa/attrs.h" #include "net/tmwa/beinghandler.h" #include "net/tmwa/buysellhandler.h" #include "net/tmwa/chathandler.h" diff --git a/src/net/tmwa/playerhandler.cpp b/src/net/tmwa/playerhandler.cpp index a0246dbd4..a555a7b71 100644 --- a/src/net/tmwa/playerhandler.cpp +++ b/src/net/tmwa/playerhandler.cpp @@ -31,6 +31,7 @@ #include "net/net.h" +#include "net/tmwa/attrs.h" #include "net/tmwa/inventoryhandler.h" #include "net/tmwa/messageout.h" #include "net/tmwa/protocol.h" diff --git a/src/net/tmwa/protocol.h b/src/net/tmwa/protocol.h index 6ff1b45ab..1531aae5f 100644 --- a/src/net/tmwa/protocol.h +++ b/src/net/tmwa/protocol.h @@ -23,32 +23,6 @@ #ifndef NET_TMWA_PROTOCOL_H #define NET_TMWA_PROTOCOL_H -namespace TmwAthena -{ - enum - { - JOB = 0xa, - - STR = 0xd, - AGI, - VIT, - INT, - DEX, - LUK, - - ATK, - DEF, - MATK, - MDEF, - HIT, - FLEE, - CRIT - -// KARMA, -// MANNER - }; -} // namespace TmwAthena - /********************************* * Packets from server to client * *********************************/ -- cgit v1.2.3-60-g2f50