summaryrefslogtreecommitdiff
path: root/src/net
diff options
context:
space:
mode:
authorBjörn Steinbrink <B.Steinbrink@gmx.de>2005-09-17 22:08:46 +0000
committerBjörn Steinbrink <B.Steinbrink@gmx.de>2005-09-17 22:08:46 +0000
commit3feb824e05df222f99bd7c296469073c5c957446 (patch)
treeeb06243e2591e51df6704b80d8930653e71c4def /src/net
parentbda21b100542279c7a58d1dd25ff6e3acda3d66c (diff)
downloadmana-3feb824e05df222f99bd7c296469073c5c957446.tar.gz
mana-3feb824e05df222f99bd7c296469073c5c957446.tar.bz2
mana-3feb824e05df222f99bd7c296469073c5c957446.tar.xz
mana-3feb824e05df222f99bd7c296469073c5c957446.zip
configure.ac: Fix typo.
src/Makefile.am: Remove useless (duplicate) -lpng. src/graphics.cpp: Add missing cstdarg header. src/net/messagein.cpp: Fix some funny looking preprocessor statement. src/net/messageout.cpp: Readd SDLnet header, for changed preprocessor stuff.
Diffstat (limited to 'src/net')
-rw-r--r--src/net/messagein.cpp2
-rw-r--r--src/net/messageout.cpp4
2 files changed, 3 insertions, 3 deletions
diff --git a/src/net/messagein.cpp b/src/net/messagein.cpp
index c4d933cc..9ea6f12e 100644
--- a/src/net/messagein.cpp
+++ b/src/net/messagein.cpp
@@ -25,7 +25,7 @@
#include <cassert>
#include <SDL_net.h>
-#if SDL_BYTEORDER == SDL_if SDL_BYTEORDER == SDL_BIG_ENDIAN_ENDIAN
+#if SDL_BYTEORDER == SDL_BIG_ENDIAN
#include "win2mac.h"
#endif
diff --git a/src/net/messageout.cpp b/src/net/messageout.cpp
index ed66f454..daf5ebf4 100644
--- a/src/net/messageout.cpp
+++ b/src/net/messageout.cpp
@@ -24,7 +24,7 @@
#include "messageout.h"
#include <string>
-//#include <SDL_net.h>
+#include <SDL_net.h>
#include "win2mac.h"
#include "network.h"
@@ -106,7 +106,7 @@ void MessageOut::writeString(const std::string &string, int length)
toWrite = string.substr(0, length);
expand(mPos + length);
}
-
+
// Write the actual string
memcpy(&mData[mPos], (void*)toWrite.c_str(), toWrite.length());
mPos += toWrite.length();