summaryrefslogtreecommitdiff
path: root/src/net
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2012-07-29 22:00:35 +0300
committerAndrei Karas <akaras@inbox.ru>2012-07-30 00:36:10 +0300
commit6fcbad4dc14b65acde858781cb0b0be1e9df9436 (patch)
tree22a555d054fc28f59477f91287df1a513c10b91a /src/net
parentb59601f599e84ed3b271a15ae4033f44e2c55763 (diff)
downloadmanaplus-6fcbad4dc14b65acde858781cb0b0be1e9df9436.tar.gz
manaplus-6fcbad4dc14b65acde858781cb0b0be1e9df9436.tar.bz2
manaplus-6fcbad4dc14b65acde858781cb0b0be1e9df9436.tar.xz
manaplus-6fcbad4dc14b65acde858781cb0b0be1e9df9436.zip
Fix code style.
Diffstat (limited to 'src/net')
-rw-r--r--src/net/eathena/protocol.h45
-rw-r--r--src/net/serverinfo.h2
-rw-r--r--src/net/tmwa/protocol.h45
3 files changed, 50 insertions, 42 deletions
diff --git a/src/net/eathena/protocol.h b/src/net/eathena/protocol.h
index 3f98fed26..e20ad0dbb 100644
--- a/src/net/eathena/protocol.h
+++ b/src/net/eathena/protocol.h
@@ -23,28 +23,31 @@
#ifndef EATHENA_PROTOCOL_H
#define EATHENA_PROTOCOL_H
-enum
+namespace EAthena
{
- JOB = 0xa,
-
- STR = 0xd,
- AGI,
- VIT,
- INT,
- DEX,
- LUK,
-
- ATK,
- DEF,
- MATK,
- MDEF,
- HIT,
- FLEE,
- CRIT
-
-// KARMA,
-// MANNER
-};
+ enum
+ {
+ JOB = 0xa,
+
+ STR = 0xd,
+ AGI,
+ VIT,
+ INT,
+ DEX,
+ LUK,
+
+ ATK,
+ DEF,
+ MATK,
+ MDEF,
+ HIT,
+ FLEE,
+ CRIT
+
+// KARMA,
+// MANNER
+ };
+}
enum
{
diff --git a/src/net/serverinfo.h b/src/net/serverinfo.h
index 232ab532a..b4665946c 100644
--- a/src/net/serverinfo.h
+++ b/src/net/serverinfo.h
@@ -28,6 +28,8 @@
#include <string>
#include <vector>
+#include "localconsts.h"
+
class ServerInfo
{
public:
diff --git a/src/net/tmwa/protocol.h b/src/net/tmwa/protocol.h
index 72952cdd0..72540c54b 100644
--- a/src/net/tmwa/protocol.h
+++ b/src/net/tmwa/protocol.h
@@ -23,28 +23,31 @@
#ifndef TA_PROTOCOL_H
#define TA_PROTOCOL_H
-enum
+namespace TmwAthena
{
- JOB = 0xa,
-
- STR = 0xd,
- AGI,
- VIT,
- INT,
- DEX,
- LUK,
-
- ATK,
- DEF,
- MATK,
- MDEF,
- HIT,
- FLEE,
- CRIT
-
-// KARMA,
-// MANNER
-};
+ enum
+ {
+ JOB = 0xa,
+
+ STR = 0xd,
+ AGI,
+ VIT,
+ INT,
+ DEX,
+ LUK,
+
+ ATK,
+ DEF,
+ MATK,
+ MDEF,
+ HIT,
+ FLEE,
+ CRIT
+
+// KARMA,
+// MANNER
+ };
+}
enum
{