From 6a0565944376426ded71849df09527da077dfc94 Mon Sep 17 00:00:00 2001 From: "Tomas Chvatal (scarabeus)" Date: Thu, 23 Oct 2008 00:09:21 +0200 Subject: Ups forget to fix header files. --- src/screen/screen_analyze.h | 4 ++-- src/screen/screen_browser.h | 25 ++++++++++----------- src/screen/screen_choiceArena.h | 4 ++-- src/screen/screen_gameType.h | 4 ++-- src/screen/screen_settingKeys.h | 48 ++++++++++++++++++++--------------------- src/screen/screen_world.h | 8 +++---- 6 files changed, 47 insertions(+), 46 deletions(-) (limited to 'src/screen') diff --git a/src/screen/screen_analyze.h b/src/screen/screen_analyze.h index 7404da6..9894399 100644 --- a/src/screen/screen_analyze.h +++ b/src/screen/screen_analyze.h @@ -7,8 +7,8 @@ typedef struct analyze_struct { - char *name; - int score; + char *name; + int score; } analyze_t; extern void startScreenAnalyze(); diff --git a/src/screen/screen_browser.h b/src/screen/screen_browser.h index 88e1ca6..28bbd4e 100644 --- a/src/screen/screen_browser.h +++ b/src/screen/screen_browser.h @@ -3,23 +3,24 @@ #define SCREEN_BROWSER_H -typedef struct server_context { - struct server_context *next, *prev; +typedef struct server_context +{ + struct server_context *next, *prev; - unsigned char state; + unsigned char state; - unsigned char ping; + unsigned char ping; - unsigned ip; - unsigned port; + unsigned ip; + unsigned port; - char *name; + char *name; - char *version; - unsigned char clients; - unsigned char maxclients; - unsigned uptime; - char *arena; + char *version; + unsigned char clients; + unsigned char maxclients; + unsigned uptime; + char *arena; } server_t; diff --git a/src/screen/screen_choiceArena.h b/src/screen/screen_choiceArena.h index 8ff3a0c..7203065 100644 --- a/src/screen/screen_choiceArena.h +++ b/src/screen/screen_choiceArena.h @@ -11,8 +11,8 @@ extern void drawScreenChoiceArena(); extern void eventScreenChoiceArena(); -extern arenaFile_t* getChoiceArena(); -extern void setChoiceArena(arenaFile_t *arenaFile); +extern arenaFile_t *getChoiceArena(); +extern void setChoiceArena(arenaFile_t * arenaFile); extern void initScreenChoiceArena(); extern void quitScreenChoiceArena(); diff --git a/src/screen/screen_gameType.h b/src/screen/screen_gameType.h index 28976e0..a83ddf2 100644 --- a/src/screen/screen_gameType.h +++ b/src/screen/screen_gameType.h @@ -10,9 +10,9 @@ extern void eventScreenGameType(); extern void initScreenGameType(); extern int setSettingGameType(int status); extern int getSettingGameType(); -extern char* getGemeTypeLoadSession(); +extern char *getGemeTypeLoadSession(); extern int setSettingIP(char *address); -extern char* getSettingIP(); +extern char *getSettingIP(); extern int setSettingPort(int port); extern int getSettingPort(); extern int getSettingProto(); diff --git a/src/screen/screen_settingKeys.h b/src/screen/screen_settingKeys.h index a85196d..54749eb 100644 --- a/src/screen/screen_settingKeys.h +++ b/src/screen/screen_settingKeys.h @@ -1,27 +1,27 @@ #ifndef SCREEN_SETTING_KEYS - #define SCREEN_SETTING_KEYS - #define KEY_TUX_RIGHT_MOVE_UP 0 - #define KEY_TUX_RIGHT_MOVE_RIGHT 1 - #define KEY_TUX_RIGHT_MOVE_LEFT 2 - #define KEY_TUX_RIGHT_MOVE_DOWN 3 - #define KEY_TUX_RIGHT_SHOOT 4 - #define KEY_TUX_RIGHT_SWITCH_WEAPON 5 - #define KEY_TUX_LEFT_MOVE_UP 6 - #define KEY_TUX_LEFT_MOVE_RIGHT 7 - #define KEY_TUX_LEFT_MOVE_LEFT 8 - #define KEY_TUX_LEFT_MOVE_DOWN 9 - #define KEY_TUX_LEFT_SHOOT 10 - #define KEY_TUX_LEFT_SWITCH_WEAPON 11 - #define KEY_LENGTH 12 +#define SCREEN_SETTING_KEYS +#define KEY_TUX_RIGHT_MOVE_UP 0 +#define KEY_TUX_RIGHT_MOVE_RIGHT 1 +#define KEY_TUX_RIGHT_MOVE_LEFT 2 +#define KEY_TUX_RIGHT_MOVE_DOWN 3 +#define KEY_TUX_RIGHT_SHOOT 4 +#define KEY_TUX_RIGHT_SWITCH_WEAPON 5 +#define KEY_TUX_LEFT_MOVE_UP 6 +#define KEY_TUX_LEFT_MOVE_RIGHT 7 +#define KEY_TUX_LEFT_MOVE_LEFT 8 +#define KEY_TUX_LEFT_MOVE_DOWN 9 +#define KEY_TUX_LEFT_SHOOT 10 +#define KEY_TUX_LEFT_SWITCH_WEAPON 11 +#define KEY_LENGTH 12 + +#include "main.h" + extern void initScreenSettingKeys(); + extern void drawScreenSettingKeys(); + extern void eventScreenSettingKeys(); + extern void quitScreenSettingKeys(); + extern void initKeyTable(); + extern int getKey(int n); + extern void quitKeyTable(); - #include "main.h" - - extern void initScreenSettingKeys(); - extern void drawScreenSettingKeys(); - extern void eventScreenSettingKeys(); - extern void quitScreenSettingKeys(); - extern void initKeyTable(); - extern int getKey(int n); - extern void quitKeyTable(); -#endif +#endif /* */ diff --git a/src/screen/screen_world.h b/src/screen/screen_world.h index 35c02ba..bf7a142 100644 --- a/src/screen/screen_world.h +++ b/src/screen/screen_world.h @@ -15,12 +15,12 @@ extern bool_t isScreenWorldInicialized(); extern void initWorld(); -extern void setWorldArena(arenaFile_t *arenaFile); +extern void setWorldArena(arenaFile_t * arenaFile); extern void setWorldEnd(); extern void countRoundInc(); -extern tux_t* getControlTux(int control_type); -extern void setControlTux(tux_t *tux, int control_type); -extern void tuxControl(tux_t *p); +extern tux_t *getControlTux(int control_type); +extern void setControlTux(tux_t * tux, int control_type); +extern void tuxControl(tux_t * p); extern void drawWorld(); extern void eventWorld(); extern void startArena(); -- cgit v1.2.3