diff options
author | Björn Steinbrink <B.Steinbrink@gmx.de> | 2005-09-17 22:08:46 +0000 |
---|---|---|
committer | Björn Steinbrink <B.Steinbrink@gmx.de> | 2005-09-17 22:08:46 +0000 |
commit | 3feb824e05df222f99bd7c296469073c5c957446 (patch) | |
tree | eb06243e2591e51df6704b80d8930653e71c4def /src | |
parent | bda21b100542279c7a58d1dd25ff6e3acda3d66c (diff) | |
download | mana-client-3feb824e05df222f99bd7c296469073c5c957446.tar.gz mana-client-3feb824e05df222f99bd7c296469073c5c957446.tar.bz2 mana-client-3feb824e05df222f99bd7c296469073c5c957446.tar.xz mana-client-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')
-rw-r--r-- | src/Makefile.am | 2 | ||||
-rw-r--r-- | src/graphics.cpp | 5 | ||||
-rw-r--r-- | src/net/messagein.cpp | 2 | ||||
-rw-r--r-- | src/net/messageout.cpp | 4 |
4 files changed, 7 insertions, 6 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index a400b149..5e866f71 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -180,5 +180,5 @@ INCLUDES = \ # the library search path. tmw_LDFLAGS = $(all_libraries) $(LIBSDL_RPATH) `pkg-config --libs libxml-2.0` tmw_CXXFLAGS = -Wall $(OPENGL_CFLAGS) $(LIBSDL_CFLAGS) `pkg-config --cflags libxml-2.0` $(CURL_CFLAGS) -tmw_LDADD = $(LIBSDL_LIBS) -lguichan_sdl -lguichan $(OPENGL_LIBS) -lphysfs $(CURL_LIBS) -lpng +tmw_LDADD = $(LIBSDL_LIBS) -lguichan_sdl -lguichan $(OPENGL_LIBS) -lphysfs $(CURL_LIBS) tmw_TARGET = tmw diff --git a/src/graphics.cpp b/src/graphics.cpp index ecee2b5f..f12d3898 100644 --- a/src/graphics.cpp +++ b/src/graphics.cpp @@ -23,14 +23,15 @@ #include "graphics.h" +#include <cstdarg> +#include <png.h> + #include "log.h" #include "graphic/imagerect.h" #include "resources/image.h" -#include <png.h> - extern volatile int framesToDraw; Graphics::Graphics(): 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(); |