summaryrefslogtreecommitdiff
path: root/src/net
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2014-05-20 22:41:20 +0300
committerAndrei Karas <akaras@inbox.ru>2014-05-20 22:41:20 +0300
commitd75ab9a77c15b7a99dcd5051846e4978c3ab71c1 (patch)
treed5594cb7d9c61a4dc9db02aa095bfba485fbd86e /src/net
parent8ed89ded1f45665fadd1e16ddc5d1b4962ad2182 (diff)
downloadmv-d75ab9a77c15b7a99dcd5051846e4978c3ab71c1.tar.gz
mv-d75ab9a77c15b7a99dcd5051846e4978c3ab71c1.tar.bz2
mv-d75ab9a77c15b7a99dcd5051846e4978c3ab71c1.tar.xz
mv-d75ab9a77c15b7a99dcd5051846e4978c3ab71c1.zip
Move player attributes in net code into separate file.
Diffstat (limited to 'src/net')
-rw-r--r--src/net/eathena/attrs.h52
-rw-r--r--src/net/eathena/charserverhandler.cpp1
-rw-r--r--src/net/eathena/generalhandler.cpp1
-rw-r--r--src/net/eathena/playerhandler.cpp1
-rw-r--r--src/net/eathena/protocol.h26
-rw-r--r--src/net/tmwa/attrs.h52
-rw-r--r--src/net/tmwa/charserverhandler.cpp1
-rw-r--r--src/net/tmwa/generalhandler.cpp1
-rw-r--r--src/net/tmwa/playerhandler.cpp1
-rw-r--r--src/net/tmwa/protocol.h26
10 files changed, 110 insertions, 52 deletions
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 <http://www.gnu.org/licenses/>.
+ */
+
+#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 <http://www.gnu.org/licenses/>.
+ */
+
+#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 *
*********************************/