diff options
| author | Yohann Ferreira <yohann_dot_ferreira_at_orange_dot_efer> | 2010-12-29 20:09:43 +0100 |
|---|---|---|
| committer | Yohann Ferreira <yohann_dot_ferreira_at_orange_dot_efer> | 2010-12-29 20:09:43 +0100 |
| commit | 74da2ff079653885d4de65f11623216bde34a94c (patch) | |
| tree | 8a9a975269e567a849c9ce494414175b68e6061e /src/chat-server | |
| parent | 3c1c0f640db636bb1cc588f22886ed165c7942d7 (diff) | |
| download | manaserv-74da2ff079653885d4de65f11623216bde34a94c.tar.gz manaserv-74da2ff079653885d4de65f11623216bde34a94c.tar.bz2 manaserv-74da2ff079653885d4de65f11623216bde34a94c.tar.xz manaserv-74da2ff079653885d4de65f11623216bde34a94c.zip | |
protocol.h -> manaserv_protocol.h to avoid conflicts with mysql files.
Resolves: Mana-Mantis #278.
Diffstat (limited to 'src/chat-server')
| -rw-r--r-- | src/chat-server/chatchannelmanager.cpp | 2 | ||||
| -rw-r--r-- | src/chat-server/chathandler.cpp | 2 | ||||
| -rw-r--r-- | src/chat-server/guildhandler.cpp | 2 | ||||
| -rw-r--r-- | src/chat-server/guildmanager.cpp | 2 | ||||
| -rw-r--r-- | src/chat-server/partyhandler.cpp | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/src/chat-server/chatchannelmanager.cpp b/src/chat-server/chatchannelmanager.cpp index 7d10f53c..70cee8f1 100644 --- a/src/chat-server/chatchannelmanager.cpp +++ b/src/chat-server/chatchannelmanager.cpp @@ -22,7 +22,7 @@ #include "chat-server/chatchannelmanager.h" -#include "protocol.h" +#include "manaserv_protocol.h" #include "account-server/storage.h" #include "chat-server/chatclient.h" #include "chat-server/chathandler.h" diff --git a/src/chat-server/chathandler.cpp b/src/chat-server/chathandler.cpp index 11865605..60474f92 100644 --- a/src/chat-server/chathandler.cpp +++ b/src/chat-server/chathandler.cpp @@ -23,7 +23,7 @@ #include <string> #include <sstream> -#include "protocol.h" +#include "manaserv_protocol.h" #include "account-server/character.h" #include "account-server/storage.h" #include "chat-server/guildmanager.h" diff --git a/src/chat-server/guildhandler.cpp b/src/chat-server/guildhandler.cpp index e6970182..4f332cdd 100644 --- a/src/chat-server/guildhandler.cpp +++ b/src/chat-server/guildhandler.cpp @@ -31,7 +31,7 @@ #include "net/messagein.h" #include "net/messageout.h" -#include "protocol.h" +#include "manaserv_protocol.h" void ChatHandler::sendGuildInvite(const std::string &invitedName, const std::string &inviterName, diff --git a/src/chat-server/guildmanager.cpp b/src/chat-server/guildmanager.cpp index 586878d7..49b135ce 100644 --- a/src/chat-server/guildmanager.cpp +++ b/src/chat-server/guildmanager.cpp @@ -20,7 +20,7 @@ #include "guildmanager.h" #include "guild.h" -#include "protocol.h" +#include "manaserv_protocol.h" #include "defines.h" #include "account-server/storage.h" #include "chat-server/chatclient.h" diff --git a/src/chat-server/partyhandler.cpp b/src/chat-server/partyhandler.cpp index 3a9b845d..00190f2c 100644 --- a/src/chat-server/partyhandler.cpp +++ b/src/chat-server/partyhandler.cpp @@ -28,7 +28,7 @@ #include "net/messagein.h" #include "net/messageout.h" -#include "protocol.h" +#include "manaserv_protocol.h" #include <algorithm> |