summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2012-07-07 00:34:29 +0300
committerAndrei Karas <akaras@inbox.ru>2012-07-07 00:34:29 +0300
commita81baa9e0bad6e312af008a800b346c172be47d1 (patch)
tree8dda8443611be191f74910fc68f336163ed4490f
parent7699848c2c24822e1169e6b91db89a69345c5666 (diff)
downloadmanaplus-a81baa9e0bad6e312af008a800b346c172be47d1.tar.gz
manaplus-a81baa9e0bad6e312af008a800b346c172be47d1.tar.bz2
manaplus-a81baa9e0bad6e312af008a800b346c172be47d1.tar.xz
manaplus-a81baa9e0bad6e312af008a800b346c172be47d1.zip
Fix code style.
-rw-r--r--src/net/eathena/npchandler.cpp3
-rw-r--r--src/net/serverinfo.h2
-rw-r--r--src/utils/xml.cpp3
3 files changed, 5 insertions, 3 deletions
diff --git a/src/net/eathena/npchandler.cpp b/src/net/eathena/npchandler.cpp
index c68dd35fd..3166a49cb 100644
--- a/src/net/eathena/npchandler.cpp
+++ b/src/net/eathena/npchandler.cpp
@@ -242,7 +242,8 @@ int NpcHandler::getNpc(Net::MessageIn &msg, bool haveLength)
return npcId;
}
-void NpcHandler::processNpcCutin(Net::MessageIn &msg A_UNUSED, int npcId A_UNUSED)
+void NpcHandler::processNpcCutin(Net::MessageIn &msg A_UNUSED,
+ int npcId A_UNUSED)
{
msg.readString(64); // image name
msg.readInt8(); // type
diff --git a/src/net/serverinfo.h b/src/net/serverinfo.h
index a8480cf1e..232ab532a 100644
--- a/src/net/serverinfo.h
+++ b/src/net/serverinfo.h
@@ -37,7 +37,7 @@ public:
MANASERV,
TMWATHENA,
EVOL,
- EATHENA,
+ EATHENA
};
typedef std::pair<int, std::string> VersionString;
diff --git a/src/utils/xml.cpp b/src/utils/xml.cpp
index f7350ce92..0da516cbf 100644
--- a/src/utils/xml.cpp
+++ b/src/utils/xml.cpp
@@ -122,7 +122,8 @@ namespace XML
return ret;
}
- int getIntProperty(XmlNodePtr node, const char* name, int def, int min, int max)
+ int getIntProperty(XmlNodePtr node, const char* name, int def,
+ int min, int max)
{
int &ret = def;