diff options
| author | Philipp Sehmisch <crush@themanaworld.org> | 2009-03-29 18:33:44 +0200 |
|---|---|---|
| committer | Philipp Sehmisch <crush@themanaworld.org> | 2009-03-29 18:33:44 +0200 |
| commit | 9587fb9b86ee4081ba14d23c1133bf1a09ee4578 (patch) | |
| tree | 7682df3ec17534be553caae85ffa9e5a68c9a815 /src/net/messageout.cpp | |
| parent | 63b41440a0555c6b39141eab94ef4627f712b476 (diff) | |
| parent | 8748f26234bba1e71bbe059147fb02256f8cec2a (diff) | |
| download | mana-client-9587fb9b86ee4081ba14d23c1133bf1a09ee4578.tar.gz mana-client-9587fb9b86ee4081ba14d23c1133bf1a09ee4578.tar.bz2 mana-client-9587fb9b86ee4081ba14d23c1133bf1a09ee4578.tar.xz mana-client-9587fb9b86ee4081ba14d23c1133bf1a09ee4578.zip | |
Merge branch 'master' of git@gitorious.org:tmw/mainline
Diffstat (limited to 'src/net/messageout.cpp')
| -rw-r--r-- | src/net/messageout.cpp | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/src/net/messageout.cpp b/src/net/messageout.cpp index 4cb4dc36..35e9a425 100644 --- a/src/net/messageout.cpp +++ b/src/net/messageout.cpp @@ -33,21 +33,16 @@ #include <cstring> #include <string> -#ifdef TMWSERV_SUPPORT MessageOut::MessageOut(short id): mData(0), -#else -MessageOut::MessageOut(Network *network): - mNetwork(network), -#endif mDataSize(0), mPos(0) { -#ifdef TMWSERV_SUPPORT - writeInt16(id); -#else +#ifdef EATHENA_SUPPORT + mNetwork = Network::instance(); mData = mNetwork->mOutBuffer + mNetwork->mOutSize; #endif + writeInt16(id); } #ifdef TMWSERV_SUPPORT |