diff options
| author | Bertram <bertram@cegetel.net> | 2009-10-09 16:31:16 +0200 |
|---|---|---|
| committer | Bertram <bertram@cegetel.net> | 2009-10-09 16:31:16 +0200 |
| commit | 1102bdc2e5a9e52b621cf58d68d0065faba2b84c (patch) | |
| tree | 4a9b849cd1a795baca0a496ff14f397f0d418f66 /src/chat-server | |
| parent | b555dd7bcc5046e9809ef37d2173955d042594da (diff) | |
| download | manaserv-1102bdc2e5a9e52b621cf58d68d0065faba2b84c.tar.gz manaserv-1102bdc2e5a9e52b621cf58d68d0065faba2b84c.tar.xz manaserv-1102bdc2e5a9e52b621cf58d68d0065faba2b84c.zip | |
Synced the protocol file with client in protocol.h, letting other defines in defines.h, and removing some overheading along the way.
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 | 1 | ||||
| -rw-r--r-- | src/chat-server/partyhandler.cpp | 2 |
5 files changed, 5 insertions, 4 deletions
diff --git a/src/chat-server/chatchannelmanager.cpp b/src/chat-server/chatchannelmanager.cpp index 1e90438..a35fbe5 100644 --- a/src/chat-server/chatchannelmanager.cpp +++ b/src/chat-server/chatchannelmanager.cpp @@ -23,7 +23,7 @@ #include "chat-server/chatchannelmanager.hpp" -#include "defines.h" +#include "protocol.h" #include "account-server/dalstorage.hpp" #include "chat-server/chatclient.hpp" #include "chat-server/chathandler.hpp" diff --git a/src/chat-server/chathandler.cpp b/src/chat-server/chathandler.cpp index 5013a07..3363cf0 100644 --- a/src/chat-server/chathandler.cpp +++ b/src/chat-server/chathandler.cpp @@ -24,7 +24,7 @@ #include <string> #include <sstream> -#include "defines.h" +#include "protocol.h" #include "account-server/character.hpp" #include "account-server/dalstorage.hpp" #include "chat-server/guildmanager.hpp" diff --git a/src/chat-server/guildhandler.cpp b/src/chat-server/guildhandler.cpp index 1c8294b..6c17a69 100644 --- a/src/chat-server/guildhandler.cpp +++ b/src/chat-server/guildhandler.cpp @@ -32,7 +32,7 @@ #include "net/messagein.hpp" #include "net/messageout.hpp" -#include "defines.h" +#include "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 84cd425..a92eded 100644 --- a/src/chat-server/guildmanager.cpp +++ b/src/chat-server/guildmanager.cpp @@ -20,6 +20,7 @@ #include "guildmanager.hpp" #include "guild.hpp" +#include "protocol.h" #include "defines.h" #include "account-server/dalstorage.hpp" #include "chat-server/chatclient.hpp" diff --git a/src/chat-server/partyhandler.cpp b/src/chat-server/partyhandler.cpp index d549b3c..c9dcb91 100644 --- a/src/chat-server/partyhandler.cpp +++ b/src/chat-server/partyhandler.cpp @@ -29,7 +29,7 @@ #include "../net/messagein.hpp" #include "../net/messageout.hpp" -#include "../defines.h" +#include "../protocol.h" #include <algorithm> |