From 8b70ac9538f7e4da10666cfc21fd368a91a77ae3 Mon Sep 17 00:00:00 2001 From: oroborus Date: Sun, 4 May 2008 19:22:36 +0000 Subject: - oprava chyby -> client sa zrutil ak dostal packety "init" a "additem" v opacnom poradi - oprava chyby -> item a shot ukazoval pointerom na tuxa, to znamenalo, ze ak sa tux odhlasil, tak item a shot ukazoval do uvolnenej pamate - oprava chyby -> exploziu si client pridaval sam, a este prijmal packet od servera, ze sa ma pridat explozia git-svn-id: http://opensvn.csie.org/tuxanci_ng@50 0ee4d065-81f0-4d1e-b06c-ff20ad07cc3e --- include/item.h | 6 +++--- include/shot.h | 4 ++-- include/tux.h | 11 +++++++---- 3 files changed, 12 insertions(+), 9 deletions(-) (limited to 'include') diff --git a/include/item.h b/include/item.h index ad390a1..3413452 100644 --- a/include/item.h +++ b/include/item.h @@ -30,7 +30,7 @@ typedef struct item_struct int count; my_time_t lastSync; - tux_t *author; + int author_id; #ifndef PUBLIC_SERVER SDL_Surface *img; //obrazok #endif @@ -60,9 +60,9 @@ typedef struct item_struct extern bool_t isItemInicialized(); extern void initItem(); -extern item_t* newItem(int x, int y, int type, tux_t *author); +extern item_t* newItem(int x, int y, int type, int author_id); extern item_t* getItemID(list_t *listItem, int id); -extern void addNewItem(list_t *listItem, tux_t *author); +extern void addNewItem(list_t *listItem, int author_id); #ifndef PUBLIC_SERVER extern void drawItem(item_t *p); extern void drawListItem(list_t *listItem); diff --git a/include/shot.h b/include/shot.h index 27f05a5..cc10c9a 100644 --- a/include/shot.h +++ b/include/shot.h @@ -26,7 +26,7 @@ typedef struct shot_struct int position; int gun; - tux_t *author; + int author_id; bool_t isCanKillAuthor; #ifndef PUBLIC_SERVER @@ -36,7 +36,7 @@ typedef struct shot_struct extern bool_t isShotInicialized(); extern void initShot(); -extern shot_t* newShot(int x,int y, int px, int py, int gun, tux_t *author); +extern shot_t* newShot(int x,int y, int px, int py, int gun, int author_id); extern shot_t* getShotID(list_t *listShot, int id); #ifndef PUBLIC_SERVER extern void drawShot(shot_t *p); diff --git a/include/tux.h b/include/tux.h index fbe4ecc..05c0c8c 100644 --- a/include/tux.h +++ b/include/tux.h @@ -6,6 +6,8 @@ #include "main.h" #include "list.h" +#define ID_UNKNOWN -1 + #define TUX_STEP 6 #define TUX_LAYER 0 @@ -37,10 +39,11 @@ #define TUX_IMG_WIDTH 40 #define TUX_IMG_HEIGHT 54 -#define TUX_UP 8 -#define TUX_LEFT 4 -#define TUX_RIGHT 6 -#define TUX_DOWN 2 +#define TUX_UP 8 +#define TUX_LEFT 4 +#define TUX_RIGHT 6 +#define TUX_DOWN 2 +#define POSITION_UNKNOWN -1 #define TUX_SHOT 5 #define TUX_SWITCH_GUN 0 -- cgit v1.2.3