From 35185452d7546ab56aa0040d7c2d68795c3f813f Mon Sep 17 00:00:00 2001 From: oroborus Date: Sun, 6 Apr 2008 17:25:52 +0000 Subject: - synchronizuju sa aj veci - preklady obsahuju aj font a velkost pismen - upravy aby to slo ( po stahnut tejto verzii sa hra musi odinstalovat a znova naonstalovat ) git-svn-id: http://opensvn.csie.org/tuxanci_ng@43 0ee4d065-81f0-4d1e-b06c-ff20ad07cc3e --- include/item.h | 6 ++++++ include/language.h | 4 +++- include/server.h | 5 +++-- include/tux.h | 3 ++- 4 files changed, 14 insertions(+), 4 deletions(-) (limited to 'include') diff --git a/include/item.h b/include/item.h index b2c8098..ad390a1 100644 --- a/include/item.h +++ b/include/item.h @@ -4,11 +4,16 @@ #define ITEM_H #include "main.h" + +#define ITEM_SYNC_TIMEOUT 5000 + #ifndef PUBLIC_SERVER #include "interface.h" #endif + #include "list.h" #include "tux.h" +#include "myTimer.h" typedef struct item_struct { @@ -23,6 +28,7 @@ typedef struct item_struct int frame; //poradove cislo animacie int count; + my_time_t lastSync; tux_t *author; #ifndef PUBLIC_SERVER diff --git a/include/language.h b/include/language.h index 03f13e7..23fc1a4 100644 --- a/include/language.h +++ b/include/language.h @@ -3,8 +3,10 @@ #define LANGUAGE_H -extern void initLanguage(); +extern int initLanguage(); extern char* getMyText(char *key); +extern char* getLanguageFont(); +extern int getLanguageSize(); extern void quitLanguage(); #endif diff --git a/include/server.h b/include/server.h index bf7a1e9..f865282 100644 --- a/include/server.h +++ b/include/server.h @@ -37,15 +37,16 @@ typedef struct client_struct { #ifdef SUPPORT_NET_UNIX_UDP sock_udp_t *socket_udp; - my_time_t lastPing; #endif #ifdef SUPPORT_NET_SDL_UDP sock_sdl_udp_t *socket_sdl_udp; - my_time_t lastPing; #endif int status; tux_t *tux; + my_time_t lastPing; + my_time_t lastEvent; + buffer_t *buffer; } client_t; diff --git a/include/tux.h b/include/tux.h index 8767afa..fbe4ecc 100644 --- a/include/tux.h +++ b/include/tux.h @@ -12,7 +12,7 @@ #define TUX_MAX_ANIMATION_FRAME 10 #define TUX_KEY 1 -#define TUX_LOCATE_UNKNOWN -1 +#define TUX_LOCATE_UNKNOWN -100 #define TUX_MAX_PICKUP 50 #define TUX_MAX_BONUS 500 @@ -23,6 +23,7 @@ #define TUX_STATUS_ALIVE 0 #define TUX_STATUS_DEAD 1 +#define TUX_STATUS_PAUZED 2 #define TUX_CONTROL_NONE 0 #define TUX_CONTROL_KEYBOARD_LEFT 1 -- cgit v1.2.3