From 5cc40aed713f6028656fd35ed710d351fcf1a347 Mon Sep 17 00:00:00 2001 From: Duane Bailey Date: Sat, 17 Sep 2005 17:20:15 +0000 Subject: 2005-09-17 Duane Bailey nayryeliab@gmail.com * game.h: fixed bugs created by matt * messageout.h: fixed bug concering expand arguments * mesageout.cpp: adding include to win2mac.h and commented out SDL_net include; caused bugs on macs --- src/game.h | 2 ++ src/net/messageout.cpp | 3 ++- src/net/messageout.h | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/game.h b/src/game.h index b85f4266..5d16f3db 100644 --- a/src/game.h +++ b/src/game.h @@ -25,6 +25,7 @@ #define _TMW_GAME_ #include +#include "Being.h" #define SPEECH_TIME 80 #define SPEECH_MAX_TIME 100 @@ -32,6 +33,7 @@ #define LOCK 254 #define IDLE 255 +class Being; extern std::string map_path; extern std::string tradePartnerName; extern int fps, frame, current_npc; diff --git a/src/net/messageout.cpp b/src/net/messageout.cpp index aa7f06c4..9c6527e0 100644 --- a/src/net/messageout.cpp +++ b/src/net/messageout.cpp @@ -24,7 +24,8 @@ #include "messageout.h" #include -#include +//#include +#include "win2mac.h" #include "network.h" #include "packet.h" diff --git a/src/net/messageout.h b/src/net/messageout.h index a312cefe..1e6d75ff 100644 --- a/src/net/messageout.h +++ b/src/net/messageout.h @@ -73,7 +73,7 @@ class MessageOut * memory in advance instead of expanding size every time more data is * added. */ - void expand(unsigned int size); + void expand(size_t size); Packet *mPacket; /**< Created packet. */ char *mData; /**< Data building up. */ -- cgit v1.2.3-70-g09d2