diff options
| author | Björn Steinbrink <B.Steinbrink@gmx.de> | 2005-09-13 22:56:29 +0000 |
|---|---|---|
| committer | Björn Steinbrink <B.Steinbrink@gmx.de> | 2005-09-13 22:56:29 +0000 |
| commit | 3dc311a652d1fda1252903a974920395e56e5668 (patch) | |
| tree | 7098d55015d28a4d973c5073d7c9e45ae03ec400 /src/game.h | |
| parent | 78771718bf7af14273d7bb0090dccff97b00b397 (diff) | |
| download | mana-3dc311a652d1fda1252903a974920395e56e5668.tar.gz mana-3dc311a652d1fda1252903a974920395e56e5668.tar.bz2 mana-3dc311a652d1fda1252903a974920395e56e5668.tar.xz mana-3dc311a652d1fda1252903a974920395e56e5668.zip | |
Merged with SDL_NET_TEST branch.
Diffstat (limited to 'src/game.h')
| -rw-r--r-- | src/game.h | 15 |
1 files changed, 6 insertions, 9 deletions
@@ -21,8 +21,10 @@ * $Id$ */ -#ifndef _TMW_GAME_H -#define _TMW_GAME_H +#ifndef _TMW_GAME_ +#define _TMW_GAME_ + +#include <string> #define SPEECH_TIME 80 #define SPEECH_MAX_TIME 100 @@ -31,12 +33,12 @@ #define IDLE 255 extern char map_path[480]; -extern char tradePartnerName[24]; +extern std::string tradePartnerName; extern int fps, frame, current_npc; extern volatile int tick_time; extern int server_tick; extern bool displayPathToMouse; -extern int startX, startY; +extern unsigned short startX, startY; enum { JOY_UP, @@ -78,11 +80,6 @@ void do_parse(); void do_exit(); /** - * Calculate packet length - */ -int get_packet_length(short); - -/** * Returns elapsed time. (Warning: very unsafe function, it supposes the delay * is always < 10 seconds) */ |