summaryrefslogtreecommitdiffstats
path: root/src/chat-server
diff options
context:
space:
mode:
authorYohann Ferreira <yohann_dot_ferreira_at_orange_dot_efer>2010-11-14 13:18:14 +0100
committerYohann Ferreira <yohann_dot_ferreira_at_orange_dot_efer>2010-11-14 13:18:14 +0100
commit196c1c0bffa8bb594ff0a7442748030f47cc9c58 (patch)
treeb60b3e3eff38907e2d8a94ce6aa7e63cd1a741c8 /src/chat-server
parent23a94e7b154726599b9112b91ebedb32af9ff22c (diff)
downloadmanaserv-196c1c0bffa8bb594ff0a7442748030f47cc9c58.tar.gz
manaserv-196c1c0bffa8bb594ff0a7442748030f47cc9c58.tar.xz
manaserv-196c1c0bffa8bb594ff0a7442748030f47cc9c58.zip
Renamed .hpp files into .h for consistency.
Also added an header to the autoattack.{h,cpp} files. Big but trivial fix.
Diffstat (limited to 'src/chat-server')
-rw-r--r--src/chat-server/chatchannel.cpp4
-rw-r--r--src/chat-server/chatchannel.h (renamed from src/chat-server/chatchannel.hpp)0
-rw-r--r--src/chat-server/chatchannelmanager.cpp12
-rw-r--r--src/chat-server/chatchannelmanager.h (renamed from src/chat-server/chatchannelmanager.hpp)2
-rw-r--r--src/chat-server/chatclient.h (renamed from src/chat-server/chatclient.hpp)2
-rw-r--r--src/chat-server/chathandler.cpp24
-rw-r--r--src/chat-server/chathandler.h (renamed from src/chat-server/chathandler.hpp)4
-rw-r--r--src/chat-server/guild.cpp2
-rw-r--r--src/chat-server/guild.h (renamed from src/chat-server/guild.hpp)0
-rw-r--r--src/chat-server/guildhandler.cpp24
-rw-r--r--src/chat-server/guildmanager.cpp10
-rw-r--r--src/chat-server/guildmanager.h (renamed from src/chat-server/guildmanager.hpp)0
-rw-r--r--src/chat-server/party.cpp2
-rw-r--r--src/chat-server/party.h (renamed from src/chat-server/party.hpp)0
-rw-r--r--src/chat-server/partyhandler.cpp14
-rw-r--r--src/chat-server/post.cpp7
-rw-r--r--src/chat-server/post.h (renamed from src/chat-server/post.hpp)2
17 files changed, 54 insertions, 55 deletions
diff --git a/src/chat-server/chatchannel.cpp b/src/chat-server/chatchannel.cpp
index 43ca1e9..52c9bf5 100644
--- a/src/chat-server/chatchannel.cpp
+++ b/src/chat-server/chatchannel.cpp
@@ -21,8 +21,8 @@
#include <algorithm>
#include <sstream>
-#include "chat-server/chatchannel.hpp"
-#include "chat-server/chatclient.hpp"
+#include "chat-server/chatchannel.h"
+#include "chat-server/chatclient.h"
ChatChannel::ChatChannel(int id,
const std::string &name,
diff --git a/src/chat-server/chatchannel.hpp b/src/chat-server/chatchannel.h
index 66ffb5b..66ffb5b 100644
--- a/src/chat-server/chatchannel.hpp
+++ b/src/chat-server/chatchannel.h
diff --git a/src/chat-server/chatchannelmanager.cpp b/src/chat-server/chatchannelmanager.cpp
index a8a3df0..7d10f53 100644
--- a/src/chat-server/chatchannelmanager.cpp
+++ b/src/chat-server/chatchannelmanager.cpp
@@ -20,14 +20,14 @@
#include <list>
-#include "chat-server/chatchannelmanager.hpp"
+#include "chat-server/chatchannelmanager.h"
#include "protocol.h"
-#include "account-server/storage.hpp"
-#include "chat-server/chatclient.hpp"
-#include "chat-server/chathandler.hpp"
-#include "chat-server/guildmanager.hpp"
-#include "common/configuration.hpp"
+#include "account-server/storage.h"
+#include "chat-server/chatclient.h"
+#include "chat-server/chathandler.h"
+#include "chat-server/guildmanager.h"
+#include "common/configuration.h"
#include "utils/stringfilter.h"
ChatChannelManager::ChatChannelManager() : mNextChannelId(1)
diff --git a/src/chat-server/chatchannelmanager.hpp b/src/chat-server/chatchannelmanager.h
index 739b428..b7f19ee 100644
--- a/src/chat-server/chatchannelmanager.hpp
+++ b/src/chat-server/chatchannelmanager.h
@@ -25,7 +25,7 @@
#include <map>
#include <deque>
-#include "chat-server/chatchannel.hpp"
+#include "chat-server/chatchannel.h"
/**
* The chat channel manager takes care of registering and removing public and
diff --git a/src/chat-server/chatclient.hpp b/src/chat-server/chatclient.h
index fed18fb..daac0fc 100644
--- a/src/chat-server/chatclient.hpp
+++ b/src/chat-server/chatclient.h
@@ -25,7 +25,7 @@
#include <string>
#include <vector>
-#include "net/netcomputer.hpp"
+#include "net/netcomputer.h"
class ChatChannel;
class Guild;
diff --git a/src/chat-server/chathandler.cpp b/src/chat-server/chathandler.cpp
index 5740dff..9a87c0c 100644
--- a/src/chat-server/chathandler.cpp
+++ b/src/chat-server/chathandler.cpp
@@ -24,20 +24,20 @@
#include <sstream>
#include "protocol.h"
-#include "account-server/character.hpp"
-#include "account-server/storage.hpp"
-#include "chat-server/guildmanager.hpp"
-#include "chat-server/chatchannelmanager.hpp"
-#include "chat-server/chatclient.hpp"
-#include "chat-server/chathandler.hpp"
-#include "common/transaction.hpp"
-#include "net/connectionhandler.hpp"
-#include "net/messagein.hpp"
-#include "net/messageout.hpp"
-#include "net/netcomputer.hpp"
+#include "account-server/character.h"
+#include "account-server/storage.h"
+#include "chat-server/guildmanager.h"
+#include "chat-server/chatchannelmanager.h"
+#include "chat-server/chatclient.h"
+#include "chat-server/chathandler.h"
+#include "common/transaction.h"
+#include "net/connectionhandler.h"
+#include "net/messagein.h"
+#include "net/messageout.h"
+#include "net/netcomputer.h"
#include "utils/logger.h"
#include "utils/stringfilter.h"
-#include "utils/tokendispenser.hpp"
+#include "utils/tokendispenser.h"
void registerChatClient(const std::string &token,
const std::string &name,
diff --git a/src/chat-server/chathandler.hpp b/src/chat-server/chathandler.h
index 1cd4306..c6b680e 100644
--- a/src/chat-server/chathandler.hpp
+++ b/src/chat-server/chathandler.h
@@ -25,8 +25,8 @@
#include <string>
#include <vector>
-#include "net/connectionhandler.hpp"
-#include "utils/tokencollector.hpp"
+#include "net/connectionhandler.h"
+#include "utils/tokencollector.h"
class ChatChannel;
class ChatClient;
diff --git a/src/chat-server/guild.cpp b/src/chat-server/guild.cpp
index 3807b68..ba1fdae 100644
--- a/src/chat-server/guild.cpp
+++ b/src/chat-server/guild.cpp
@@ -18,7 +18,7 @@
* along with The Mana Server. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "guild.hpp"
+#include "guild.h"
#include "defines.h"
#include <algorithm>
diff --git a/src/chat-server/guild.hpp b/src/chat-server/guild.h
index e9207a3..e9207a3 100644
--- a/src/chat-server/guild.hpp
+++ b/src/chat-server/guild.h
diff --git a/src/chat-server/guildhandler.cpp b/src/chat-server/guildhandler.cpp
index 63d69b6..e697018 100644
--- a/src/chat-server/guildhandler.cpp
+++ b/src/chat-server/guildhandler.cpp
@@ -18,18 +18,18 @@
* along with The Mana Server. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "chathandler.hpp"
-#include "chatchannel.hpp"
-#include "chatchannelmanager.hpp"
-#include "chatclient.hpp"
-#include "guild.hpp"
-#include "guildmanager.hpp"
-
-#include "account-server/character.hpp"
-#include "account-server/storage.hpp"
-
-#include "net/messagein.hpp"
-#include "net/messageout.hpp"
+#include "chathandler.h"
+#include "chatchannel.h"
+#include "chatchannelmanager.h"
+#include "chatclient.h"
+#include "guild.h"
+#include "guildmanager.h"
+
+#include "account-server/character.h"
+#include "account-server/storage.h"
+
+#include "net/messagein.h"
+#include "net/messageout.h"
#include "protocol.h"
diff --git a/src/chat-server/guildmanager.cpp b/src/chat-server/guildmanager.cpp
index 81dd609..586878d 100644
--- a/src/chat-server/guildmanager.cpp
+++ b/src/chat-server/guildmanager.cpp
@@ -18,13 +18,13 @@
* along with The Mana Server. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "guildmanager.hpp"
-#include "guild.hpp"
+#include "guildmanager.h"
+#include "guild.h"
#include "protocol.h"
#include "defines.h"
-#include "account-server/storage.hpp"
-#include "chat-server/chatclient.hpp"
-#include "chat-server/chathandler.hpp"
+#include "account-server/storage.h"
+#include "chat-server/chatclient.h"
+#include "chat-server/chathandler.h"
GuildManager::GuildManager()
{
diff --git a/src/chat-server/guildmanager.hpp b/src/chat-server/guildmanager.h
index b236b75..b236b75 100644
--- a/src/chat-server/guildmanager.hpp
+++ b/src/chat-server/guildmanager.h
diff --git a/src/chat-server/party.cpp b/src/chat-server/party.cpp
index e9f193b..0719e8f 100644
--- a/src/chat-server/party.cpp
+++ b/src/chat-server/party.cpp
@@ -18,7 +18,7 @@
* along with The Mana Server. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "party.hpp"
+#include "party.h"
#include <algorithm>
diff --git a/src/chat-server/party.hpp b/src/chat-server/party.h
index 29bb7f2..29bb7f2 100644
--- a/src/chat-server/party.hpp
+++ b/src/chat-server/party.h
diff --git a/src/chat-server/partyhandler.cpp b/src/chat-server/partyhandler.cpp
index e3d8e09..3a9b845 100644
--- a/src/chat-server/partyhandler.cpp
+++ b/src/chat-server/partyhandler.cpp
@@ -18,15 +18,15 @@
* along with The Mana Server. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "chathandler.hpp"
-#include "chatclient.hpp"
-#include "party.hpp"
+#include "chathandler.h"
+#include "chatclient.h"
+#include "party.h"
-#include "account-server/storage.hpp"
-#include "account-server/serverhandler.hpp"
+#include "account-server/storage.h"
+#include "account-server/serverhandler.h"
-#include "net/messagein.hpp"
-#include "net/messageout.hpp"
+#include "net/messagein.h"
+#include "net/messageout.h"
#include "protocol.h"
diff --git a/src/chat-server/post.cpp b/src/chat-server/post.cpp
index 456b09f..eff5ddb 100644
--- a/src/chat-server/post.cpp
+++ b/src/chat-server/post.cpp
@@ -18,15 +18,14 @@
* along with The Mana Server. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "post.hpp"
+#include "post.h"
-#include "../account-server/character.hpp"
-#include "../common/configuration.hpp"
+#include "../account-server/character.h"
+#include "../common/configuration.h"
Letter::Letter(unsigned int type, Character *sender, Character *receiver)
: mId(0), mType(type), mSender(sender), mReceiver(receiver)
{
-
}
Letter::~Letter()
diff --git a/src/chat-server/post.hpp b/src/chat-server/post.h
index 01ded79..1cb4072 100644
--- a/src/chat-server/post.hpp
+++ b/src/chat-server/post.h
@@ -25,7 +25,7 @@
#include <string>
#include <vector>
-#include "../common/inventorydata.hpp"
+#include "../common/inventorydata.h"
class Item;
class Character;