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/audio/audio.h | 14 ++--- src/audio/music.h | 56 +++++++++--------- src/audio/sound.h | 50 ++++++++-------- src/base/arena.h | 40 +++++++------ src/base/arenaFile.h | 37 ++++++------ src/base/bool.h | 10 ++-- src/base/buffer.h | 24 ++++---- src/base/checkFront.h | 28 ++++----- src/base/director.h | 26 ++++----- src/base/gun.h | 24 ++++---- src/base/homeDirector.h | 10 ++-- src/base/idManager.h | 32 +++++----- src/base/index.h | 20 +++---- src/base/item.h | 126 ++++++++++++++++++++-------------------- src/base/list.h | 42 +++++++------- src/base/main.h | 36 ++++++------ src/base/modules.h | 79 +++++++++++++------------ src/base/myTimer.h | 45 +++++++------- src/base/net_multiplayer.h | 3 +- src/base/protect.h | 38 ++++++------ src/base/proto.h | 58 +++++++++--------- src/base/server.h | 28 ++++----- src/base/serverSendMsg.h | 3 +- src/base/shareFunction.h | 11 ++-- src/base/shot.h | 96 +++++++++++++++--------------- src/base/space.h | 62 +++++++++++--------- src/base/storage.h | 20 ++++--- src/base/tcp_server.h | 6 +- src/base/textFile.h | 14 ++--- src/base/tux.h | 66 ++++++++++----------- src/base/udp_server.h | 4 +- src/client/client.h | 1 - src/client/configFile.h | 12 ++-- src/client/font.h | 7 ++- src/client/hotKey.h | 2 +- src/client/image.h | 13 +++-- src/client/interface.h | 2 +- src/client/keyboardBuffer.h | 13 +++-- src/client/layer.h | 28 ++++----- src/client/panel.h | 2 +- src/client/radar.h | 2 +- src/client/saveLoad.h | 2 +- src/client/screen.h | 22 +++---- src/net/dns.h | 2 +- src/net/tcp.h | 34 +++++------ src/net/udp.h | 32 +++++----- 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 +-- src/server/heightScore.h | 2 +- src/server/publicServer.h | 2 +- src/server/serverConfigFile.h | 2 +- src/widget/widget.h | 21 +++---- src/widget/widget_button.h | 15 ++--- src/widget/widget_buttonimage.h | 20 +++---- src/widget/widget_catchkey.h | 20 +++---- src/widget/widget_check.h | 20 +++---- src/widget/widget_choicegroup.h | 26 ++++----- src/widget/widget_image.h | 11 ++-- src/widget/widget_label.h | 14 ++--- src/widget/widget_select.h | 25 ++++---- src/widget/widget_textfield.h | 29 +++++---- 65 files changed, 804 insertions(+), 778 deletions(-) diff --git a/src/audio/audio.h b/src/audio/audio.h index 4a79d5f..61873c3 100644 --- a/src/audio/audio.h +++ b/src/audio/audio.h @@ -1,10 +1,10 @@ #ifndef AUDIO_H - #define AUDIO_H - - #include "main.h" - - extern bool_t isAudioInicialized(); - extern void initAudio(); - extern void quitAudio(); +#define AUDIO_H + +#include "main.h" + +extern bool_t isAudioInicialized(); +extern void initAudio(); +extern void quitAudio(); #endif diff --git a/src/audio/music.h b/src/audio/music.h index 2cbdc15..2e6cd3f 100644 --- a/src/audio/music.h +++ b/src/audio/music.h @@ -1,31 +1,31 @@ #ifndef MUSIC_H - #define MUSIC_H - #ifndef NO_SOUND - #include - #include "main.h" - - #define MUSIC_GROUP_BASE "base" - #define MUSIC_GROUP_USER "user" - - /* - typedef struct music_struct - { - char *name; - int group; - Mix_Music *music; - } music_t; - */ - - extern bool_t isMusicInicialized(); - extern void initMusic(); - extern void addMusic(char *file, char *name, char *group); - extern void stopMusic(); - extern void playMusic(char *name, char *group); - extern void setMusicActive(bool_t n); - extern bool_t isMusicActive(); - extern char* getCurrentMusic(); - extern void delAllMusicInGroup(char *group); - extern void quitMusic(); - #endif +#define MUSIC_H +#ifndef NO_SOUND +#include +#include "main.h" + +#define MUSIC_GROUP_BASE "base" +#define MUSIC_GROUP_USER "user" + + /* + typedef struct music_struct + { + char *name; + int group; + Mix_Music *music; + } music_t; + */ + +extern bool_t isMusicInicialized(); +extern void initMusic(); +extern void addMusic(char *file, char *name, char *group); +extern void stopMusic(); +extern void playMusic(char *name, char *group); +extern void setMusicActive(bool_t n); +extern bool_t isMusicActive(); +extern char *getCurrentMusic(); +extern void delAllMusicInGroup(char *group); +extern void quitMusic(); +#endif #endif diff --git a/src/audio/sound.h b/src/audio/sound.h index 0bc0954..cb85471 100644 --- a/src/audio/sound.h +++ b/src/audio/sound.h @@ -1,28 +1,28 @@ #ifndef SOUND_H - #define SOUND_H - #ifndef NO_SOUND - #include - #include "main.h" - - #define SOUND_GROUP_BASE "base" - #define SOUND_GROUP_USER "user" - - /* - typedef struct sound_struct - { - char *name; - int group; - Mix_Chunk *sound; - } sound_t; - */ - - extern bool_t isSoundInicialized(); - extern void initSound(); - extern void addSound(char *file, char *name, char *group); - extern void playSound(char *name, char *group); - extern void setSoundActive(bool_t n); - extern bool_t isSoundActive(); - extern void quitSound(); - #endif +#define SOUND_H +#ifndef NO_SOUND +#include +#include "main.h" + +#define SOUND_GROUP_BASE "base" +#define SOUND_GROUP_USER "user" + + /* + typedef struct sound_struct + { + char *name; + int group; + Mix_Chunk *sound; + } sound_t; + */ + +extern bool_t isSoundInicialized(); +extern void initSound(); +extern void addSound(char *file, char *name, char *group); +extern void playSound(char *name, char *group); +extern void setSoundActive(bool_t n); +extern bool_t isSoundActive(); +extern void quitSound(); +#endif #endif diff --git a/src/base/arena.h b/src/base/arena.h index 5730bea..3ff21d3 100644 --- a/src/base/arena.h +++ b/src/base/arena.h @@ -22,36 +22,38 @@ typedef struct arena_struct { #ifndef PUBLIC_SERVER - char music[STR_SIZE]; + char music[STR_SIZE]; - image_t *background; + image_t *background; #endif - int w, h; + int w, h; - list_t *listTimer; + list_t *listTimer; - space_t *spaceShot; - space_t *spaceTux; - space_t *spaceItem; + space_t *spaceShot; + space_t *spaceTux; + space_t *spaceItem; - int countRound; - int max_countRound; + int countRound; + int max_countRound; } arena_t; -extern void setCurrentArena(arena_t *p); -extern arena_t* getCurrentArena(); +extern void setCurrentArena(arena_t * p); +extern arena_t *getCurrentArena(); extern void initArena(); extern void quitArena(); -extern arena_t* newArena(int w, int h); -extern int conflictSpace(int x1,int y1,int w1,int h1,int x2,int y2,int w2,int h2); -extern int isFreeSpace(arena_t *arena, int x, int y, int w, int h); -extern void findFreeSpace(arena_t *arena, int *x, int *y, int w, int h); -extern void getCenterScreen(int *screen_x, int *screen_y, int x, int y, int screen_size_x, int screen_size_y); +extern arena_t *newArena(int w, int h); +extern int conflictSpace(int x1, int y1, int w1, int h1, int x2, int y2, + int w2, int h2); +extern int isFreeSpace(arena_t * arena, int x, int y, int w, int h); +extern void findFreeSpace(arena_t * arena, int *x, int *y, int w, int h); +extern void getCenterScreen(int *screen_x, int *screen_y, int x, int y, + int screen_size_x, int screen_size_y); #ifndef PUBLIC_SERVER -extern void drawArena(arena_t *arena); +extern void drawArena(arena_t * arena); #endif -extern void eventArena(arena_t *arena); -extern void destroyArena(arena_t *p); +extern void eventArena(arena_t * arena); +extern void destroyArena(arena_t * p); #endif diff --git a/src/base/arenaFile.h b/src/base/arenaFile.h index 652cdf0..bc54176 100644 --- a/src/base/arenaFile.h +++ b/src/base/arenaFile.h @@ -1,33 +1,34 @@ #ifndef ARENA_FILE_H - #define ARENA_FILE_H - #define PUBLIC_SERVER_PATH_ARENA "./arena/" - - #include "main.h" - #include "arena.h" - #include "textFile.h" - +#define ARENA_FILE_H +#define PUBLIC_SERVER_PATH_ARENA "./arena/" + +#include "main.h" +#include "arena.h" +#include "textFile.h" + typedef struct { - char *path; - textFile_t *map; + char *path; + textFile_t *map; } arenaFile_t; extern bool_t isAreaFileInicialized(); extern int getArenaValue(char *line, char *env, char *val, int len); extern int getArenaCount(); -extern char *getArenaName(arenaFile_t *arenaFile); -extern char *getArenaNetName(arenaFile_t *arenaFile); -extern arenaFile_t* getArenaFileFormNetName(char *s); -extern char *getArenaImage(arenaFile_t *arenaFile); +extern char *getArenaName(arenaFile_t * arenaFile); +extern char *getArenaNetName(arenaFile_t * arenaFile); +extern arenaFile_t *getArenaFileFormNetName(char *s); +extern char *getArenaImage(arenaFile_t * arenaFile); #ifndef PUBLIC_SERVER -extern image_t* loadImageFromArena(arenaFile_t *arenaFile, char *filename, char *group, char *name, int alpha); +extern image_t *loadImageFromArena(arenaFile_t * arenaFile, char *filename, + char *group, char *name, int alpha); #endif -extern arenaFile_t* getArenaFile(int n); -extern int getArenaFileID(arenaFile_t *arenaFile); -extern arena_t* getArena(arenaFile_t *arenaFile); -extern arenaFile_t* newArenaFile(char *path); +extern arenaFile_t *getArenaFile(int n); +extern int getArenaFileID(arenaFile_t * arenaFile); +extern arena_t *getArena(arenaFile_t * arenaFile); +extern arenaFile_t *newArenaFile(char *path); extern void loadArenaFile(char *path); extern void initArenaFile(); extern void quitArenaFile(); diff --git a/src/base/bool.h b/src/base/bool.h index 9d02ba2..4289878 100644 --- a/src/base/bool.h +++ b/src/base/bool.h @@ -1,9 +1,9 @@ #ifndef BOOL_H - #define BOOL_H - #define bool_t int - #define TRUE 1 - #define FALSE 0 +#define BOOL_H +#define bool_t int +#define TRUE 1 +#define FALSE 0 - #include "main.h" +#include "main.h" #endif diff --git a/src/base/buffer.h b/src/base/buffer.h index 1b9e6ee..8c2e3ce 100755 --- a/src/base/buffer.h +++ b/src/base/buffer.h @@ -7,19 +7,19 @@ typedef struct str_buffer { - char *data; - unsigned int size; - unsigned int alloc; + char *data; + unsigned int size; + unsigned int alloc; } buffer_t; -extern buffer_t * newBuffer(int n); -extern void* getBufferData(buffer_t *p); -extern int getBufferSize(buffer_t *p); -extern int addBuffer(buffer_t *p, char *data, int len); -extern int cutBuffer(buffer_t *p, int len); -extern int getBufferCount(buffer_t *p); -extern int getBufferLine(buffer_t *p, char *line, int len); -extern int getBufferDataLen(buffer_t *p, char *line, int len); -extern void destroyBuffer(buffer_t *p); +extern buffer_t *newBuffer(int n); +extern void *getBufferData(buffer_t * p); +extern int getBufferSize(buffer_t * p); +extern int addBuffer(buffer_t * p, char *data, int len); +extern int cutBuffer(buffer_t * p, int len); +extern int getBufferCount(buffer_t * p); +extern int getBufferLine(buffer_t * p, char *line, int len); +extern int getBufferDataLen(buffer_t * p, char *line, int len); +extern void destroyBuffer(buffer_t * p); #endif diff --git a/src/base/checkFront.h b/src/base/checkFront.h index bcf0a18..32d23b7 100644 --- a/src/base/checkFront.h +++ b/src/base/checkFront.h @@ -1,21 +1,21 @@ #ifndef CHECK_FRONT_H - #define CHECK_FRONT_H - #define CHECK_FRONT_SEND_TIME_INTERVAL 100 - #define CHECK_FRONT_MAX_COUNT_SEND 30 - - #define CHECK_FRONT_ID_NONE -1 - #define CHECK_FRONT_TYPE_SIMPLE 1 - #define CHECK_FRONT_TYPE_CHECK 2 +#define CHECK_FRONT_H +#define CHECK_FRONT_SEND_TIME_INTERVAL 100 +#define CHECK_FRONT_MAX_COUNT_SEND 30 - #include "list.h" - #include "server.h" +#define CHECK_FRONT_ID_NONE -1 +#define CHECK_FRONT_TYPE_SIMPLE 1 +#define CHECK_FRONT_TYPE_CHECK 2 - extern list_t* newCheckFront(); - extern void addMsgInCheckFront(list_t *list, char *msg, int type, int id); - extern void eventMsgInCheckFront(client_t *client); - extern void delMsgInCheckFront(list_t *listCheckFront, int id); - extern void destroyCheckFront(list_t *p); +#include "list.h" +#include "server.h" + +extern list_t *newCheckFront(); +extern void addMsgInCheckFront(list_t * list, char *msg, int type, int id); +extern void eventMsgInCheckFront(client_t * client); +extern void delMsgInCheckFront(list_t * listCheckFront, int id); +extern void destroyCheckFront(list_t * p); #endif diff --git a/src/base/director.h b/src/base/director.h index 1baad86..f050642 100644 --- a/src/base/director.h +++ b/src/base/director.h @@ -1,16 +1,16 @@ #ifndef DIRECTOR_H - #define DIRECTOR_H - - #include "main.h" - #include "list.h" - - typedef struct director_struct - { - char *path; - list_t *list; - } director_t; - - extern director_t* loadDirector(char *s); - extern void destroyDirector(director_t *p); +#define DIRECTOR_H + +#include "main.h" +#include "list.h" + +typedef struct director_struct +{ + char *path; + list_t *list; +} director_t; + +extern director_t *loadDirector(char *s); +extern void destroyDirector(director_t * p); #endif diff --git a/src/base/gun.h b/src/base/gun.h index 77ab4fe..38727e1 100644 --- a/src/base/gun.h +++ b/src/base/gun.h @@ -1,15 +1,15 @@ #ifndef GUN_H - #define GUN_H - #define GUN_SHOT_WIDTH 5 - #define GUN_SHOT_HEIGHT 5 - #define GUN_LASSER_HORIZONTAL 40 - #define GUN_SHOT_VERTICAL 5 - #define GUN_BOMBBALL_WIDTH 20 - #define GUN_BOMBBALL_HEIGHT 20 +#define GUN_H +#define GUN_SHOT_WIDTH 5 +#define GUN_SHOT_HEIGHT 5 +#define GUN_LASSER_HORIZONTAL 40 +#define GUN_SHOT_VERTICAL 5 +#define GUN_BOMBBALL_WIDTH 20 +#define GUN_BOMBBALL_HEIGHT 20 - #include "main.h" - #include "tux.h" - - extern void shotInGun(tux_t *p); -#endif +#include "main.h" +#include "tux.h" + +extern void shotInGun(tux_t * p); +#endif diff --git a/src/base/homeDirector.h b/src/base/homeDirector.h index 22c9243..e4133ee 100755 --- a/src/base/homeDirector.h +++ b/src/base/homeDirector.h @@ -1,10 +1,10 @@ #ifndef HOMEDIRECTOR_H - #define HOMEDIRECTOR_H - #define HOMEDIRECTOR_NAME ".tuxanci" +#define HOMEDIRECTOR_H +#define HOMEDIRECTOR_NAME ".tuxanci" - #include "main.h" +#include "main.h" - extern void createHomeDirector(); - extern char *getHomeDirector(); +extern void createHomeDirector(); +extern char *getHomeDirector(); #endif diff --git a/src/base/idManager.h b/src/base/idManager.h index fc28c74..d157419 100644 --- a/src/base/idManager.h +++ b/src/base/idManager.h @@ -1,20 +1,20 @@ #ifndef ID_MANAGER_H - #define ID_MANAGER_H - #define MAX_ID 1000000 - #define ID_UNKNOWN -1 - #ifdef __WIN32__ - #define random rand - #endif - #include "list.h" - - extern void initListID(); - extern int isRegisterID(int id); - extern int getNewIDcount(int count); - extern int getNewID(); - extern void incID(int id); - extern void delID(int id); - extern void replaceID(int old_id, int new_id); - extern void quitListID(); +#define ID_MANAGER_H +#define MAX_ID 1000000 +#define ID_UNKNOWN -1 +#ifdef __WIN32__ +#define random rand +#endif +#include "list.h" + +extern void initListID(); +extern int isRegisterID(int id); +extern int getNewIDcount(int count); +extern int getNewID(); +extern void incID(int id); +extern void delID(int id); +extern void replaceID(int old_id, int new_id); +extern void quitListID(); #endif diff --git a/src/base/index.h b/src/base/index.h index 0dd544c..9126706 100644 --- a/src/base/index.h +++ b/src/base/index.h @@ -8,17 +8,17 @@ typedef struct index_item_struct { - int key; - void *data; + int key; + void *data; } index_item_t; -extern list_t* newIndex(); -extern void addToIndex(list_t *list, int key, void *data); -extern void* getFromIndex(list_t *list, int key); -extern void delFromIndex(list_t *list, int key); -extern void delFromIndexWithObject(list_t *list, int key, void *f); -extern void actionIndexWithObject(list_t *list, void *f); -extern void destroyIndex(list_t *list); -extern void destroyIndexWithObject(list_t *list, void *f); +extern list_t *newIndex(); +extern void addToIndex(list_t * list, int key, void *data); +extern void *getFromIndex(list_t * list, int key); +extern void delFromIndex(list_t * list, int key); +extern void delFromIndexWithObject(list_t * list, int key, void *f); +extern void actionIndexWithObject(list_t * list, void *f); +extern void destroyIndex(list_t * list); +extern void destroyIndexWithObject(list_t * list, void *f); #endif diff --git a/src/base/item.h b/src/base/item.h index 78ea944..f007e59 100644 --- a/src/base/item.h +++ b/src/base/item.h @@ -1,69 +1,69 @@ #ifndef ITEM_H - #define ITEM_H - #define ITEM_SYNC_TIMEOUT 5000 - #ifdef __WIN32__ - #define random rand - #endif - #define ITEM_MAX_COUNT 1 - #define ITEM_GUN_MAX_FRAME 8 - #define ITEM_MINE_MAX_FRAME 1 - #define ITEM_EXPLOSION_MAX_FRAME 10 - #define ITEM_BONUS_MAX_FRAME 8 - #define ITEM_GUN_WIDTH 50 - #define ITEM_GUN_HEIGHT 20 - #define ITEM_MINE_WIDTH 15 - #define ITEM_MINE_HEIGHT 11 - #define ITEM_EXPLOSION_WIDTH 40 - #define ITEM_EXPLOSION_HEIGHT 40 - #define ITEM_BIG_EXPLOSION_WIDTH 100 - #define ITEM_BIG_EXPLOSION_HEIGHT 100 - #define ITEM_BONUS_WIDTH 20 - #define ITEM_BONUS_HEIGHT 20 +#define ITEM_H +#define ITEM_SYNC_TIMEOUT 5000 +#ifdef __WIN32__ +#define random rand +#endif +#define ITEM_MAX_COUNT 1 +#define ITEM_GUN_MAX_FRAME 8 +#define ITEM_MINE_MAX_FRAME 1 +#define ITEM_EXPLOSION_MAX_FRAME 10 +#define ITEM_BONUS_MAX_FRAME 8 +#define ITEM_GUN_WIDTH 50 +#define ITEM_GUN_HEIGHT 20 +#define ITEM_MINE_WIDTH 15 +#define ITEM_MINE_HEIGHT 11 +#define ITEM_EXPLOSION_WIDTH 40 +#define ITEM_EXPLOSION_HEIGHT 40 +#define ITEM_BIG_EXPLOSION_WIDTH 100 +#define ITEM_BIG_EXPLOSION_HEIGHT 100 +#define ITEM_BONUS_WIDTH 20 +#define ITEM_BONUS_HEIGHT 20 + +#include "main.h" +#ifndef PUBLIC_SERVER +#include "image.h" +#endif +#include "list.h" +#include "tux.h" +#include "myTimer.h" + +typedef struct item_struct +{ + int id; + int type; // type of thing - #include "main.h" - #ifndef PUBLIC_SERVER - #include "image.h" - #endif - #include "list.h" - #include "tux.h" - #include "myTimer.h" + int x; // item position + int y; - typedef struct item_struct - { - int id; - int type; // type of thing - - int x; // item position - int y; - - int w; // item size - int h; - - int frame; //number of animation - int count; - - int author_id; - #ifndef PUBLIC_SERVER - image_t *img; //picture - #endif - } item_t; + int w; // item size + int h; - extern bool_t isItemInicialized(); - extern void initItem(); - extern item_t* newItem(int x, int y, int type, int author_id); - extern void getStatusItem(void *p, int *id, int *x, int *y ,int *w, int *h); - extern void setStatusItem(void *p, int x, int y, int w, int h); - extern void replaceItemID(item_t *item, int id); - extern void addNewItem(space_t *spaceItem, int author_id); - #ifndef PUBLIC_SERVER - extern void drawItem(item_t *p); - extern void drawListItem(list_t *listItem); - #endif - extern void eventListItem(space_t *listSpace); - extern void eventConflictShotWithItem(arena_t *arena); - extern void eventGiveTuxItem(tux_t *tux, item_t *item, space_t *spaceItem); - extern void eventGiveTuxListItem(tux_t *tux, space_t *spaceItem); - extern void destroyItem(item_t *p); - extern void quitItem(); + int frame; //number of animation + int count; + + int author_id; +#ifndef PUBLIC_SERVER + image_t *img; //picture +#endif +} item_t; + +extern bool_t isItemInicialized(); +extern void initItem(); +extern item_t *newItem(int x, int y, int type, int author_id); +extern void getStatusItem(void *p, int *id, int *x, int *y, int *w, int *h); +extern void setStatusItem(void *p, int x, int y, int w, int h); +extern void replaceItemID(item_t * item, int id); +extern void addNewItem(space_t * spaceItem, int author_id); +#ifndef PUBLIC_SERVER +extern void drawItem(item_t * p); +extern void drawListItem(list_t * listItem); +#endif +extern void eventListItem(space_t * listSpace); +extern void eventConflictShotWithItem(arena_t * arena); +extern void eventGiveTuxItem(tux_t * tux, item_t * item, space_t * spaceItem); +extern void eventGiveTuxListItem(tux_t * tux, space_t * spaceItem); +extern void destroyItem(item_t * p); +extern void quitItem(); #endif diff --git a/src/base/list.h b/src/base/list.h index 3813b35..e532cb2 100755 --- a/src/base/list.h +++ b/src/base/list.h @@ -1,27 +1,27 @@ #ifndef LIST_H - #define LIST_H - #define LIST_ALLOC_LIMIT 16 +#define LIST_H +#define LIST_ALLOC_LIMIT 16 - #include "main.h" +#include "main.h" - typedef struct list_str - { - void **list; - int count; - int alloc; - } list_t; +typedef struct list_str +{ + void **list; + int count; + int alloc; +} list_t; - extern list_t* newList(); - extern list_t* cloneList(list_t *p); - extern list_t* cloneListItem(list_t *p, void *f); - extern void addList(list_t *p, void *item); - extern void insList(list_t *p, int n, void *item); - extern void *getList(list_t *p,int n); - extern int searchListItem(list_t *p, void *n); - extern void delList(list_t *p,int n); - extern void delListItem(list_t *p,int n,void *f); - extern void listDoEmpty(list_t *p); - extern void destroyList(list_t *p); - extern void destroyListItem(list_t *p,void *f); +extern list_t *newList(); +extern list_t *cloneList(list_t * p); +extern list_t *cloneListItem(list_t * p, void *f); +extern void addList(list_t * p, void *item); +extern void insList(list_t * p, int n, void *item); +extern void *getList(list_t * p, int n); +extern int searchListItem(list_t * p, void *n); +extern void delList(list_t * p, int n); +extern void delListItem(list_t * p, int n, void *f); +extern void listDoEmpty(list_t * p); +extern void destroyList(list_t * p); +extern void destroyListItem(list_t * p, void *f); #endif diff --git a/src/base/main.h b/src/base/main.h index 3555550..9b0f59c 100644 --- a/src/base/main.h +++ b/src/base/main.h @@ -1,28 +1,28 @@ #ifndef MAIN_H - #define MAIN_H - #define WINDOW_SIZE_X 800 - #define WINDOW_SIZE_Y 600 +#define MAIN_H +#define WINDOW_SIZE_X 800 +#define WINDOW_SIZE_Y 600 #ifdef NLS - #define _(text) gettext(text) +#define _(text) gettext(text) #else - #define _(text) (text) +#define _(text) (text) #endif #ifdef NLS - #include - #include +#include +#include #endif - #include "bool.h" - #include "string_length.h" - #include "path.h" +#include "bool.h" +#include "string_length.h" +#include "path.h" - extern char* getParam(char *s); - extern char* getParamElse(char *s1, char *s2); - extern bool_t isParamFlag(char *s); - extern char *getString(int n); - extern int* newInt(int x); - extern int isFillPath(const char *path); - extern void accessExistFile(const char *s); - extern int tryExistFile (const char *s); +extern char *getParam(char *s); +extern char *getParamElse(char *s1, char *s2); +extern bool_t isParamFlag(char *s); +extern char *getString(int n); +extern int *newInt(int x); +extern int isFillPath(const char *path); +extern void accessExistFile(const char *s); +extern int tryExistFile(const char *s); #endif diff --git a/src/base/modules.h b/src/base/modules.h index e5a15f1..f0cbfb1 100644 --- a/src/base/modules.h +++ b/src/base/modules.h @@ -19,58 +19,61 @@ typedef struct export_fce_s { - int (*fce_getValue)(char *line, char *env, char *val, int len); + int (*fce_getValue) (char *line, char *env, char *val, int len); #ifndef PUBLIC_SERVER - image_t* (*fce_getImage)(char *group, char *name); + image_t *(*fce_getImage) (char *group, char *name); - void (*fce_addLayer)(image_t *img, - int x,int y, int px,int py, - int w,int h, int player); + void (*fce_addLayer) (image_t * img, + int x, int y, int px, int py, + int w, int h, int player); #endif - int (*fce_getNetTypeGame)(); - int (*fce_loadDepModule)(char *name); - void (*fce_addToShareFce)(char *name, void *function); - void* (*fce_getShareFce)(char *name); - - void (*fce_getTuxProportion)(tux_t *tux, int *x,int *y, int *w, int *h); - void (*fce_setTuxProportion)(tux_t *tux, int x, int y); - tux_t* (*fce_getTuxID)(list_t *listTux, int id); - void (*fce_actionTux)(tux_t *tux, int action); - - arena_t* (*fce_getCurrentArena)(); - int (*fce_conflictSpace)(int x1,int y1,int w1,int h1,int x2,int y2,int w2,int h2); - int (*fce_isFreeSpace)(arena_t *arena, int x, int y, int w, int h); - void (*fce_findFreeSpace)(arena_t *arena, int *x, int *y, int w, int h); - void (*fce_proto_send_module_server)(int type, client_t *client, char *msg); - void (*fce_proto_send_module_client)(char *msg); - - my_time_t (*fce_getMyTime)(); - - void (*fce_destroyShot)(shot_t *p); - void (*fce_boundBombBall)(shot_t *shot); - void (*fce_transformOnlyLasser)(shot_t *shot); + int (*fce_getNetTypeGame) (); + int (*fce_loadDepModule) (char *name); + void (*fce_addToShareFce) (char *name, void *function); + void *(*fce_getShareFce) (char *name); + + void (*fce_getTuxProportion) (tux_t * tux, int *x, int *y, int *w, + int *h); + void (*fce_setTuxProportion) (tux_t * tux, int x, int y); + tux_t *(*fce_getTuxID) (list_t * listTux, int id); + void (*fce_actionTux) (tux_t * tux, int action); + + arena_t *(*fce_getCurrentArena) (); + int (*fce_conflictSpace) (int x1, int y1, int w1, int h1, int x2, int y2, + int w2, int h2); + int (*fce_isFreeSpace) (arena_t * arena, int x, int y, int w, int h); + void (*fce_findFreeSpace) (arena_t * arena, int *x, int *y, int w, int h); + void (*fce_proto_send_module_server) (int type, client_t * client, + char *msg); + void (*fce_proto_send_module_client) (char *msg); + + my_time_t(*fce_getMyTime) (); + + void (*fce_destroyShot) (shot_t * p); + void (*fce_boundBombBall) (shot_t * shot); + void (*fce_transformOnlyLasser) (shot_t * shot); } export_fce_t; typedef struct module_s { - char *name; + char *name; #ifndef __WIN32__ - void *image; + void *image; #else - HINSTANCE *image; + HINSTANCE *image; #endif - int (*fce_init)(export_fce_t *p); + int (*fce_init) (export_fce_t * p); #ifndef PUBLIC_SERVER - int (*fce_draw)(int x, int y,int w, int h); + int (*fce_draw) (int x, int y, int w, int h); #endif - int (*fce_event)(); - int (*fce_isConflict)(int x, int y, int w, int h); - void (*fce_cmd)(char *line); - void (*fce_recvMsg)(char *msg); - int (*fce_destroy)(); + int (*fce_event) (); + int (*fce_isConflict) (int x, int y, int w, int h); + void (*fce_cmd) (char *line); + void (*fce_recvMsg) (char *msg); + int (*fce_destroy) (); } module_t; @@ -86,4 +89,4 @@ extern int isConflictModule(int x, int y, int w, int h); extern int recvMsgModule(char *msg); extern void quitModule(); -#endif +#endif diff --git a/src/base/myTimer.h b/src/base/myTimer.h index 24980fb..548a883 100644 --- a/src/base/myTimer.h +++ b/src/base/myTimer.h @@ -1,28 +1,29 @@ #ifndef MY_TIME_H - #define MY_TIME_H - #define my_time_t unsigned int - #define TIMER_ONE 0 - #define TIMER_PERIODIC 1 +#define MY_TIME_H +#define my_time_t unsigned int +#define TIMER_ONE 0 +#define TIMER_PERIODIC 1 - #include "main.h" - #include "list.h" +#include "main.h" +#include "list.h" - typedef struct my_timer_struct - { - unsigned int id; - void (*fce)(void *p); - void *arg; - int type; - my_time_t createTime; - my_time_t time; - } my_timer_t; +typedef struct my_timer_struct +{ + unsigned int id; + void (*fce) (void *p); + void *arg; + int type; + my_time_t createTime; + my_time_t time; +} my_timer_t; - extern list_t* newTimer(); - extern void restartTimer(); - extern my_time_t getMyTime(); - extern int addTaskToTimer(list_t *listTimer, int type, void (*fce)(void *p), void *arg, my_time_t my_time); - extern void eventTimer(list_t *listTimer); - extern void delTimer(list_t *listTimer, int id); - extern void destroyTimer(list_t *listTimer); +extern list_t *newTimer(); +extern void restartTimer(); +extern my_time_t getMyTime(); +extern int addTaskToTimer(list_t * listTimer, int type, void (*fce) (void *p), + void *arg, my_time_t my_time); +extern void eventTimer(list_t * listTimer); +extern void delTimer(list_t * listTimer, int id); +extern void destroyTimer(list_t * listTimer); #endif diff --git a/src/base/net_multiplayer.h b/src/base/net_multiplayer.h index b7676c5..d92d3e5 100644 --- a/src/base/net_multiplayer.h +++ b/src/base/net_multiplayer.h @@ -28,7 +28,8 @@ #define NET_MASTER_PORT 2200 #ifdef PUBLIC_SERVER -extern int initNetMuliplayerForGameServer(char *ip4, int port4, char *ip6, int port6); +extern int initNetMuliplayerForGameServer(char *ip4, int port4, char *ip6, + int port6); #endif extern int initNetMuliplayer(int type, char *ip, int port, int proto); diff --git a/src/base/protect.h b/src/base/protect.h index ec9db56..54c5554 100644 --- a/src/base/protect.h +++ b/src/base/protect.h @@ -1,25 +1,25 @@ #ifndef PROTECT_H - #define PROTECT_H - #define PROTECT_PING_INTERVAL_TIMEOUT 5000 - #define PROTECT_SPEED_INTERVAL_TIMEOUT 40 - #define PROTECT_SPEED_AVARAGE 10 +#define PROTECT_H +#define PROTECT_PING_INTERVAL_TIMEOUT 5000 +#define PROTECT_SPEED_INTERVAL_TIMEOUT 40 +#define PROTECT_SPEED_AVARAGE 10 - #include "main.h" - #include "myTimer.h" +#include "main.h" +#include "myTimer.h" - typedef struct protect_struct - { - my_time_t lastPing; - my_time_t lastMove; - my_time_t avarage; - int count; - bool_t isDown; - } protect_t; +typedef struct protect_struct +{ + my_time_t lastPing; + my_time_t lastMove; + my_time_t avarage; + int count; + bool_t isDown; +} protect_t; - extern protect_t* newProtect(); - extern void refreshLastMove(protect_t *p); - extern void rereshLastPing(protect_t *p); - extern bool_t isDown(protect_t *p); - extern void destroyProtect(protect_t *p); +extern protect_t *newProtect(); +extern void refreshLastMove(protect_t * p); +extern void rereshLastPing(protect_t * p); +extern bool_t isDown(protect_t * p); +extern void destroyProtect(protect_t * p); #endif diff --git a/src/base/proto.h b/src/base/proto.h index 614faa9..6442469 100644 --- a/src/base/proto.h +++ b/src/base/proto.h @@ -35,69 +35,73 @@ #define PROTO_ERROR_CODE_TIMEOUT 4 #define PROTO_ERROR_LIMIT_MAX_CLIENT 5 -extern void proto_send_error_server(int type, client_t *client, int errorcode); +extern void proto_send_error_server(int type, client_t * client, + int errorcode); extern void proto_recv_error_client(char *msg); extern void proto_send_hello_client(char *name); -extern void proto_recv_hello_server(client_t *client, char *msg); +extern void proto_recv_hello_server(client_t * client, char *msg); -extern void proto_send_status_server(int type, client_t *client); -extern void proto_recv_status_server(client_t *client, char *msg); +extern void proto_send_status_server(int type, client_t * client); +extern void proto_recv_status_server(client_t * client, char *msg); -extern void proto_send_listscore_server(int type, client_t *client, int max); -extern void proto_recv_listscore_server(client_t *client, char *msg); +extern void proto_send_listscore_server(int type, client_t * client, int max); +extern void proto_recv_listscore_server(client_t * client, char *msg); extern void proto_send_check_client(int id); -extern void proto_recv_check_server(client_t *client, char *msg); +extern void proto_recv_check_server(client_t * client, char *msg); -extern void proto_send_init_server(int type, client_t *client, client_t *client2); +extern void proto_send_init_server(int type, client_t * client, + client_t * client2); extern void proto_recv_init_client(char *msg); -extern void proto_send_event_server(int type, client_t *client, tux_t *tux, int action); +extern void proto_send_event_server(int type, client_t * client, tux_t * tux, + int action); extern void proto_recv_event_client(char *msg); extern void proto_send_event_client(int action); -extern void proto_recv_event_server(client_t *client, char *msg); +extern void proto_recv_event_server(client_t * client, char *msg); -extern void proto_send_newtux_server(int type, client_t *client, tux_t *tux); +extern void proto_send_newtux_server(int type, client_t * client, + tux_t * tux); extern void proto_recv_newtux_client(char *msg); -extern void proto_send_kill_server(int type, client_t *client, tux_t *tux); +extern void proto_send_kill_server(int type, client_t * client, tux_t * tux); extern void proto_recv_kill_client(char *msg); -extern void proto_send_score_server(int type, client_t *client, tux_t *tux); +extern void proto_send_score_server(int type, client_t * client, tux_t * tux); extern void proto_recv_score_client(char *msg); -extern void proto_send_del_server(int type, client_t *client, int id); +extern void proto_send_del_server(int type, client_t * client, int id); extern void proto_recv_del_client(char *msg); -extern void proto_send_additem_server(int type, client_t *client, item_t *p); +extern void proto_send_additem_server(int type, client_t * client, + item_t * p); extern void proto_recv_additem_client(char *msg); -extern void proto_send_shot_server(int type, client_t *client, shot_t *p); +extern void proto_send_shot_server(int type, client_t * client, shot_t * p); extern void proto_recv_shot_client(char *msg); extern void proto_send_chat_client(char *s); -extern void proto_recv_chat_server(client_t *client, char *msg); -extern void proto_send_chat_server(int type, client_t *client, char *msg); +extern void proto_recv_chat_server(client_t * client, char *msg); +extern void proto_send_chat_server(int type, client_t * client, char *msg); extern void proto_recv_chat_client(char *msg); extern void proto_send_module_client(char *s); -extern void proto_recv_module_server(client_t *client, char *msg); -extern void proto_send_module_server(int type, client_t *client, char *msg); +extern void proto_recv_module_server(client_t * client, char *msg); +extern void proto_send_module_server(int type, client_t * client, char *msg); extern void proto_recv_module_client(char *msg); extern void proto_send_ping_client(); -extern void proto_recv_ping_server(client_t *client, char *msg); -extern void proto_send_ping_server(int type, client_t *client); +extern void proto_recv_ping_server(client_t * client, char *msg); +extern void proto_send_ping_server(int type, client_t * client); extern void proto_recv_ping_client(char *msg); -extern void proto_recv_echo_server(client_t *client, char *msg); -extern void proto_send_echo_server(int type, client_t *client, char *s); +extern void proto_recv_echo_server(client_t * client, char *msg); +extern void proto_send_echo_server(int type, client_t * client, char *s); -extern void proto_send_end_server(int type, client_t *client); +extern void proto_send_end_server(int type, client_t * client); extern void proto_recv_end_client(char *msg); extern void proto_send_end_client(); -extern void proto_recv_end_server(client_t *client, char *msg); +extern void proto_recv_end_server(client_t * client, char *msg); #endif - diff --git a/src/base/server.h b/src/base/server.h index d109224..b95b9d9 100644 --- a/src/base/server.h +++ b/src/base/server.h @@ -29,34 +29,34 @@ typedef struct client_struct { - int type; + int type; - sock_udp_t *socket_udp; + sock_udp_t *socket_udp; - buffer_t *recvBuffer; - buffer_t *sendBuffer; + buffer_t *recvBuffer; + buffer_t *sendBuffer; - int status; + int status; - tux_t *tux; + tux_t *tux; - protect_t *protect; + protect_t *protect; - list_t *listSendMsg; - list_t *listRecvMsg; + list_t *listSendMsg; + list_t *listRecvMsg; - list_t *listSeesShot; + list_t *listSeesShot; } client_t; extern int initServer(char *ip4, int port4, char *ip6, int port6); extern time_t getUpdateServer(); -extern client_t* newAnyClient(); -extern void destroyAnyClient(client_t *p); -extern list_t* getListServerClient(); +extern client_t *newAnyClient(); +extern void destroyAnyClient(client_t * p); +extern list_t *getListServerClient(); extern int getServerMaxClients(); extern void setServerTimer(); extern void setServerMaxClients(int n); -extern void sendClient(client_t *p, char *msg); +extern void sendClient(client_t * p, char *msg); extern void eventServer(); extern void quitServer(); diff --git a/src/base/serverSendMsg.h b/src/base/serverSendMsg.h index 49da067..c09c0f9 100644 --- a/src/base/serverSendMsg.h +++ b/src/base/serverSendMsg.h @@ -10,6 +10,7 @@ #define PROTO_SEND_BUT 3 #define PROTO_SEND_ALL_SEES_TUX 4 -extern void protoSendClient(int type, client_t *client, char *msg, int type2, int id); +extern void protoSendClient(int type, client_t * client, char *msg, int type2, + int id); #endif diff --git a/src/base/shareFunction.h b/src/base/shareFunction.h index 04f0af3..de4677e 100644 --- a/src/base/shareFunction.h +++ b/src/base/shareFunction.h @@ -1,10 +1,9 @@ #ifndef SHARE_FUNCTION_H - #define SHARE_FUNCTION_H +#define SHARE_FUNCTION_H - extern void initShareFunction(); - extern void addToShareFce(char *name, void *function); - extern void* getShareFce(char *name); - extern void quitShareFunction(); +extern void initShareFunction(); +extern void addToShareFce(char *name, void *function); +extern void *getShareFce(char *name); +extern void quitShareFunction(); #endif - diff --git a/src/base/shot.h b/src/base/shot.h index 1b3569e..6a2a8e2 100644 --- a/src/base/shot.h +++ b/src/base/shot.h @@ -1,54 +1,54 @@ #ifndef SHOT_H - #define SHOT_H - #ifdef __WIN32__ - #define random rand - #endif - - #include "main.h" - #include "list.h" - #include "tux.h" - #include "arena.h" - #ifndef PUBLIC_SERVER - #include "image.h" - #endif +#define SHOT_H +#ifdef __WIN32__ +#define random rand +#endif - typedef struct shot_struct - { - int id; - int x; - int y; - int w; - int h; - int px; - int py; - int position; - int gun; - int author_id; - bool_t isCanKillAuthor; - bool_t del; - #ifndef PUBLIC_SERVER - image_t *img; - #endif - } shot_t; +#include "main.h" +#include "list.h" +#include "tux.h" +#include "arena.h" +#ifndef PUBLIC_SERVER +#include "image.h" +#endif - extern bool_t isShotInicialized(); - extern void initShot(); - 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); - extern void replaceShotID(shot_t *shot, int id); - extern void getStatusShot(void *p, int *id, int *x,int *y, int *w, int *h); - extern void setStatusShot(void *p, int x, int y, int w, int h); - #ifndef PUBLIC_SERVER - extern void drawShot(shot_t *p); - extern void drawListShot(list_t *listShot); - #endif - extern int isConflictWithListShot(list_t *listShot, int x, int y, int w, int h); - extern void eventMoveListShot(arena_t *arena); - extern void checkShotIsInTuxScreen(arena_t *arena); - extern void boundBombBall(shot_t *shot); - extern void transformOnlyLasser(shot_t *shot); - extern void destroyShot(shot_t *p); - extern void quitShot(); +typedef struct shot_struct +{ + int id; + int x; + int y; + int w; + int h; + int px; + int py; + int position; + int gun; + int author_id; + bool_t isCanKillAuthor; + bool_t del; +#ifndef PUBLIC_SERVER + image_t *img; #endif +} shot_t; +extern bool_t isShotInicialized(); +extern void initShot(); +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); +extern void replaceShotID(shot_t * shot, int id); +extern void getStatusShot(void *p, int *id, int *x, int *y, int *w, int *h); +extern void setStatusShot(void *p, int x, int y, int w, int h); +#ifndef PUBLIC_SERVER +extern void drawShot(shot_t * p); +extern void drawListShot(list_t * listShot); +#endif +extern int isConflictWithListShot(list_t * listShot, int x, int y, int w, + int h); +extern void eventMoveListShot(arena_t * arena); +extern void checkShotIsInTuxScreen(arena_t * arena); +extern void boundBombBall(shot_t * shot); +extern void transformOnlyLasser(shot_t * shot); +extern void destroyShot(shot_t * p); +extern void quitShot(); +#endif diff --git a/src/base/space.h b/src/base/space.h index cf2d7c8..e1ac594 100644 --- a/src/base/space.h +++ b/src/base/space.h @@ -8,44 +8,50 @@ typedef struct zone_struct { - list_t *list; + list_t *list; } zone_t; typedef struct space_struct { - int w; - int h; + int w; + int h; - int segW; - int segH; + int segW; + int segH; - zone_t ***zone; + zone_t ***zone; - list_t *listIndex; + list_t *listIndex; - void (*getStatus)(void *p, int *id, int *x, int *y, int *w, int *h); - void (*setStatus)(void *p, int x, int y, int w, int h); + void (*getStatus) (void *p, int *id, int *x, int *y, int *w, int *h); + void (*setStatus) (void *p, int x, int y, int w, int h); } space_t; extern space_t *newSpace(int w, int h, int segW, int segH, - void (*getStatus)(void *p, int *id, int *x, int *y, int *w, int *h), - void (*setStatus)(void *p, int x, int y, int w, int h)); - -extern int getSpaceCount(space_t *p); -extern void* getItemFromSpace(space_t *p, int offset); -extern void addObjectToSpace(space_t *p, void *item); -extern void getObjectFromSpace(space_t *p, int x, int y, int w, int h, list_t *list); -extern void* getObjectFromSpaceWithID(space_t *p, int id); -extern int isConflictWithObjectFromSpace(space_t *p, int x, int y, int w, int h); -extern int isConflictWithObjectFromSpaceBut(space_t *p, int x, int y, int w, int h, void *but); -extern void delObjectFromSpace(space_t *p, void *item); -extern void delObjectFromSpaceWithObject(space_t *p, void *item, void *f); -extern void moveObjectInSpace(space_t *p, void *item, int move_x, int move_y); -extern void printSpace(space_t *p); -extern void actionSpace(space_t *space, void *f, void *p); -extern void actionSpaceFromLocation(space_t *space, void *f, void *p, int x, int y, int w, int h); -extern void destroySpace(space_t *p); -extern void destroySpaceWithObject(space_t *p, void *f); + void (*getStatus) (void *p, int *id, int *x, int *y, + int *w, int *h), + void (*setStatus) (void *p, int x, int y, int w, + int h)); + +extern int getSpaceCount(space_t * p); +extern void *getItemFromSpace(space_t * p, int offset); +extern void addObjectToSpace(space_t * p, void *item); +extern void getObjectFromSpace(space_t * p, int x, int y, int w, int h, + list_t * list); +extern void *getObjectFromSpaceWithID(space_t * p, int id); +extern int isConflictWithObjectFromSpace(space_t * p, int x, int y, int w, + int h); +extern int isConflictWithObjectFromSpaceBut(space_t * p, int x, int y, int w, + int h, void *but); +extern void delObjectFromSpace(space_t * p, void *item); +extern void delObjectFromSpaceWithObject(space_t * p, void *item, void *f); +extern void moveObjectInSpace(space_t * p, void *item, int move_x, + int move_y); +extern void printSpace(space_t * p); +extern void actionSpace(space_t * space, void *f, void *p); +extern void actionSpaceFromLocation(space_t * space, void *f, void *p, int x, + int y, int w, int h); +extern void destroySpace(space_t * p); +extern void destroySpaceWithObject(space_t * p, void *f); #endif - diff --git a/src/base/storage.h b/src/base/storage.h index 8943f6c..6305f81 100644 --- a/src/base/storage.h +++ b/src/base/storage.h @@ -1,14 +1,16 @@ #ifndef STORAGE_H - #define STORAGE_H +#define STORAGE_H - #include "main.h" - #include "list.h" +#include "main.h" +#include "list.h" - extern list_t* newStorage(); - extern void addItemToStorage(list_t *list, char *group, char *name, void *data); - extern void* getItemFromStorage(list_t *list, char *group, char *name); - extern void delItemFromStorage(list_t *list, char *group, char *name, void *f); - extern void delAllItemFromStorage(list_t *list, char *group, void *f); - extern void destroyStorage(list_t *p, void *f); +extern list_t *newStorage(); +extern void addItemToStorage(list_t * list, char *group, char *name, + void *data); +extern void *getItemFromStorage(list_t * list, char *group, char *name); +extern void delItemFromStorage(list_t * list, char *group, char *name, + void *f); +extern void delAllItemFromStorage(list_t * list, char *group, void *f); +extern void destroyStorage(list_t * p, void *f); #endif diff --git a/src/base/tcp_server.h b/src/base/tcp_server.h index 21ef90c..508d880 100644 --- a/src/base/tcp_server.h +++ b/src/base/tcp_server.h @@ -8,12 +8,12 @@ #define SERVER_TCP_BUFFER_LIMIT 4096 -extern client_t* newTcpClient(sock_tcp_t *sock_tcp); -extern void destroyTcpClient(client_t *p); +extern client_t *newTcpClient(sock_tcp_t * sock_tcp); +extern void destroyTcpClient(client_t * p); extern int initTcpServer(char *ip4, int port4, char *ip6, int port6); extern void setServerTcpSelect(); extern int selectServerTcpSocket(); -extern void sendTcpClientBuffer(client_t *p); +extern void sendTcpClientBuffer(client_t * p); extern void quitTcpServer(); #endif diff --git a/src/base/textFile.h b/src/base/textFile.h index d9c7b4d..9dd0d33 100755 --- a/src/base/textFile.h +++ b/src/base/textFile.h @@ -11,15 +11,15 @@ typedef struct str_textFile_t { - char *file; - list_t *text; + char *file; + list_t *text; } textFile_t; -extern textFile_t* newTextFile(char *s); -extern textFile_t* loadTextFile(char *s); -extern void printTextFile(textFile_t *p); -extern void saveTextFile(textFile_t *p); -extern void destroyTextFile(textFile_t *p); +extern textFile_t *newTextFile(char *s); +extern textFile_t *loadTextFile(char *s); +extern void printTextFile(textFile_t * p); +extern void saveTextFile(textFile_t * p); +extern void destroyTextFile(textFile_t * p); #endif diff --git a/src/base/tux.h b/src/base/tux.h index d5ec2fb..39ead49 100644 --- a/src/base/tux.h +++ b/src/base/tux.h @@ -81,58 +81,58 @@ typedef struct tux_struct { - int id; + int id; - int x; - int y; + int x; + int y; - char name[STR_NAME_SIZE]; + char name[STR_NAME_SIZE]; - int status; - int control; - int position; - int score; + int status; + int control; + int position; + int score; - int gun; - int shot[GUN_COUNT]; - int round; - int bonus; + int gun; + int shot[GUN_COUNT]; + int round; + int bonus; - int bonus_time; - int pickup_time; - - bool_t isCanShot; - bool_t isCanSwitchGun; + int bonus_time; + int pickup_time; - int frame; + bool_t isCanShot; + bool_t isCanSwitchGun; - void *client; + int frame; + + void *client; } tux_t; extern bool_t isTuxInicialized(); extern void initTux(); -extern tux_t* newTux(); -extern void tuxSetName(tux_t *tux, char *name); -extern bool_t isTuxAnyGun(tux_t *tux); +extern tux_t *newTux(); +extern void tuxSetName(tux_t * tux, char *name); +extern bool_t isTuxAnyGun(tux_t * tux); extern void getCourse(int n, int *x, int *y); -extern void drawTux(tux_t *tux); +extern void drawTux(tux_t * tux); //extern void drawListTux(list_t *listTux); -extern void eventTuxIsDead(tux_t *tux); +extern void eventTuxIsDead(tux_t * tux); //extern tux_t* isConflictWithListTux(list_t *listTux, int x, int y, int w, int h); //extern int isConflictTuxWithListTux(tux_t *tux, list_t *listTux); -extern void eventConflictTuxWithShot(arena_t *arena); +extern void eventConflictTuxWithShot(arena_t * arena); //extern void eventConflictTuxWithTeleport(list_t *listTux, list_t *listTeleport); -extern void tuxTeleport(tux_t *tux); -extern void actionTux(tux_t *tux, int action); -extern void eventTux(tux_t *tux); +extern void tuxTeleport(tux_t * tux); +extern void actionTux(tux_t * tux, int action); +extern void eventTux(tux_t * tux); //extern void eventListTux(list_t *listTux); //extern tux_t* getTuxID(list_t *listTux, int id); -extern void getTuxProportion(tux_t *tux, int *x,int *y, int *w, int *h); -extern void replaceTuxID(tux_t *tux, int id); -extern void setTuxProportion(tux_t *tux, int x, int y); -extern void getStatusTux(void *p, int *id, int *x,int *y, int *w, int *h); +extern void getTuxProportion(tux_t * tux, int *x, int *y, int *w, int *h); +extern void replaceTuxID(tux_t * tux, int id); +extern void setTuxProportion(tux_t * tux, int x, int y); +extern void getStatusTux(void *p, int *id, int *x, int *y, int *w, int *h); extern void setStatusTux(void *p, int x, int y, int w, int h); -extern void destroyTux(tux_t *tux); +extern void destroyTux(tux_t * tux); extern void quitTux(); #endif diff --git a/src/base/udp_server.h b/src/base/udp_server.h index 576e63d..85a6f8e 100644 --- a/src/base/udp_server.h +++ b/src/base/udp_server.h @@ -6,8 +6,8 @@ #include "server.h" #include "udp.h" -extern client_t* newUdpClient(sock_udp_t *sock_udp); -extern void destroyUdpClient(client_t *p); +extern client_t *newUdpClient(sock_udp_t * sock_udp); +extern void destroyUdpClient(client_t * p); extern int initUdpServer(char *ip4, int port4, char *ip6, int port6); extern void setServerUdpSelect(); extern int selectServerUdpSocket(); diff --git a/src/client/client.h b/src/client/client.h index 8766594..bfde073 100644 --- a/src/client/client.h +++ b/src/client/client.h @@ -17,4 +17,3 @@ extern void eventClient(); extern void quitClient(); #endif - diff --git a/src/client/configFile.h b/src/client/configFile.h index f68a381..f7f16fc 100644 --- a/src/client/configFile.h +++ b/src/client/configFile.h @@ -7,14 +7,16 @@ #include "textFile.h" extern int isYesOrNO(char *s); -extern char* getYesOrNo(int n); +extern char *getYesOrNo(int n); extern int getValue(char *line, char *env, char *val, int len); -extern char* setValue(char *line, char *env, char *val); +extern char *setValue(char *line, char *env, char *val); -extern int getValueInConfigFile(textFile_t *textFile, char *env, char *val, int len); -extern int setValueInConfigFile(textFile_t *textFile, char *env, char *val); +extern int getValueInConfigFile(textFile_t * textFile, char *env, char *val, + int len); +extern int setValueInConfigFile(textFile_t * textFile, char *env, char *val); -extern void loadValueFromConfigFile(textFile_t *textFile, char *env, char *val, int len, char *butVal); +extern void loadValueFromConfigFile(textFile_t * textFile, char *env, + char *val, int len, char *butVal); #endif diff --git a/src/client/font.h b/src/client/font.h index b404e59..28f7373 100755 --- a/src/client/font.h +++ b/src/client/font.h @@ -18,9 +18,10 @@ #define FONT_SIZE 16 extern bool_t isFontInicialized(); -extern void initFont(char *file,int size); -extern void drawFont(char *s,int x,int y,int r,int g,int b); -extern void drawFontMaxSize(char *s, int x, int y, int w, int h, int r, int g, int b); +extern void initFont(char *file, int size); +extern void drawFont(char *s, int x, int y, int r, int g, int b); +extern void drawFontMaxSize(char *s, int x, int y, int w, int h, int r, int g, + int b); extern int getFontSize(); extern void getTextSize(char *s, int *w, int *h); extern void quitFont(); diff --git a/src/client/hotKey.h b/src/client/hotKey.h index 1e15c1c..383033d 100644 --- a/src/client/hotKey.h +++ b/src/client/hotKey.h @@ -6,7 +6,7 @@ #define HOTKEY_ACTIVE_INTERVAL 500 extern void initHotKey(); -extern void registerHotKey(SDLKey key, void (*handler)()); +extern void registerHotKey(SDLKey key, void (*handler) ()); extern void unregisterHotKey(SDLKey key); extern void enableHotKey(SDLKey key); extern void disableHotKey(SDLKey key); diff --git a/src/client/image.h b/src/client/image.h index c154ff0..5b637b2 100755 --- a/src/client/image.h +++ b/src/client/image.h @@ -25,18 +25,19 @@ typedef struct image_struct typedef struct image_struct { - int w; - int h; - SDL_Surface *image; + int w; + int h; + SDL_Surface *image; } image_t; extern bool_t isImageInicialized(); extern void initImageData(); -extern image_t* addImageData(char *file, int alpha, char *name, char *group); -extern image_t* getImage(char *group, char *name); +extern image_t *addImageData(char *file, int alpha, char *name, char *group); +extern image_t *getImage(char *group, char *name); extern void delImage(char *group, char *name); extern void delAllImageInGroup(char *group); -extern void drawImage(image_t *p, int x,int y, int px, int py, int w, int h); +extern void drawImage(image_t * p, int x, int y, int px, int py, int w, + int h); extern void quitImageData(); #endif diff --git a/src/client/interface.h b/src/client/interface.h index 3da0ba3..95bef25 100755 --- a/src/client/interface.h +++ b/src/client/interface.h @@ -33,7 +33,7 @@ extern bool_t isInterfaceInicialized(); extern void enableKeyboardBuffer(); extern void disableKeyboardBuffer(); extern int initSDL(); -extern SDL_Surface* getSDL_Screen(); +extern SDL_Surface *getSDL_Screen(); extern void getMousePosition(int *x, int *y); extern int isMouseClicked(); extern int isPressAnyKey(); diff --git a/src/client/keyboardBuffer.h b/src/client/keyboardBuffer.h index 911eca7..81f183b 100644 --- a/src/client/keyboardBuffer.h +++ b/src/client/keyboardBuffer.h @@ -14,12 +14,13 @@ #include #include "main.h" -typedef struct { - SDL_keysym *buff; /* buffer klaves (kod dle SDLKey enumu) */ - int size; /* aktualni velikost alokovaneho bufferu (v poctu uchovatelnych klaves) */ - int count; /* pocet klaves aktualne v bufferu */ - int begin; /* ukazatel na zacatek bufferu (tj. kam se pridavaji klavesy) */ - int end; /* ukazatel na konec bufferu (tj. odkud se odebiraji klavesy) */ +typedef struct +{ + SDL_keysym *buff; /* buffer klaves (kod dle SDLKey enumu) */ + int size; /* aktualni velikost alokovaneho bufferu (v poctu uchovatelnych klaves) */ + int count; /* pocet klaves aktualne v bufferu */ + int begin; /* ukazatel na zacatek bufferu (tj. kam se pridavaji klavesy) */ + int end; /* ukazatel na konec bufferu (tj. odkud se odebiraji klavesy) */ } keyboardBuffer_t; extern void initKeyboardBuffer(int size); diff --git a/src/client/layer.h b/src/client/layer.h index eea611a..ece1d01 100755 --- a/src/client/layer.h +++ b/src/client/layer.h @@ -8,21 +8,21 @@ typedef struct layer_str { - int x; //suradnice obrazka na obrazovke - int y; + int x; //suradnice obrazka na obrazovke + int y; - int w; //rozmery obrazka na obrazovke - int h; + int w; //rozmery obrazka na obrazovke + int h; - int px; //suradnice casti surfrace - int py; + int px; //suradnice casti surfrace + int py; - int pw; //rozmeri casti surfrace - int ph; + int pw; //rozmeri casti surfrace + int ph; - int layer; + int layer; - image_t *image; //dane surfrace + image_t *image; //dane surfrace } layer_t; extern bool_t isLayerInicialized(); @@ -39,16 +39,16 @@ extern void initLayer(); * (0 - pod tuxancami | 1 - na tej istej ako tuxanci | 2 - nad tuxancami) */ -extern void addLayer(image_t *img, - int x,int y, int px,int py, - int w,int h, int player); +extern void addLayer(image_t * img, + int x, int y, int px, int py, int w, int h, int player); /* * Vykresli zoznam na obrazovku */ extern void drawLayer(); extern void drawLayerCenter(int x, int y); -extern void drawLayerSplit(int local_x, int local_y, int x, int y, int w, int h); +extern void drawLayerSplit(int local_x, int local_y, int x, int y, int w, + int h); extern void flushLayer(); extern void quitLayer(); diff --git a/src/client/panel.h b/src/client/panel.h index 6eadd92..cfc0b5e 100644 --- a/src/client/panel.h +++ b/src/client/panel.h @@ -21,7 +21,7 @@ extern bool_t isPanelInicialized(); extern void initPanel(); -extern void drawPanel(tux_t *tux_right, tux_t *tux_left); +extern void drawPanel(tux_t * tux_right, tux_t * tux_left); extern void quitPanel(); #endif diff --git a/src/client/radar.h b/src/client/radar.h index 8dd9d88..a3f7b69 100644 --- a/src/client/radar.h +++ b/src/client/radar.h @@ -18,7 +18,7 @@ extern void initRadar(); extern void addToRadar(int id, int x, int y, int type); extern void delFromRadar(int id); -extern void drawRadar(arena_t *arena); +extern void drawRadar(arena_t * arena); extern void quitRadar(); #endif diff --git a/src/client/saveLoad.h b/src/client/saveLoad.h index 875e1f8..2860408 100644 --- a/src/client/saveLoad.h +++ b/src/client/saveLoad.h @@ -6,7 +6,7 @@ #include "textFile.h" #include "arena.h" -extern void saveArena(char *filename, arena_t *arena); +extern void saveArena(char *filename, arena_t * arena); extern void loadArena(char *filename); #endif diff --git a/src/client/screen.h b/src/client/screen.h index 55e5bb6..b0bdca3 100644 --- a/src/client/screen.h +++ b/src/client/screen.h @@ -7,26 +7,26 @@ typedef struct screen_struct { - char *name; - void (*fce_start)(); - void (*fce_event)(); - void (*fce_draw)(); - void (*fce_stop)(); + char *name; + void (*fce_start) (); + void (*fce_event) (); + void (*fce_draw) (); + void (*fce_stop) (); } screen_t; extern bool_t isScreenInicialized(); -extern screen_t* newScreen(char *name, - void (*fce_start)(), void (*fce_event)(), - void (*fce_draw)(), void (*fce_stop)()); +extern screen_t *newScreen(char *name, + void (*fce_start) (), void (*fce_event) (), + void (*fce_draw) (), void (*fce_stop) ()); -extern void destroyScreen(screen_t *p); -extern void registerScreen(screen_t *p); +extern void destroyScreen(screen_t * p); +extern void registerScreen(screen_t * p); extern void initScreen(); extern void setScreen(char *name); extern void switchScreen(); extern void startScreen(char *name); -extern char* getScreen(); +extern char *getScreen(); extern void drawScreen(); extern void eventScreen(); extern void quitScreen(); diff --git a/src/net/dns.h b/src/net/dns.h index ae92c35..a2cd997 100644 --- a/src/net/dns.h +++ b/src/net/dns.h @@ -3,6 +3,6 @@ #define DNS_H -extern char* getIPFormDNS(char *domain); +extern char *getIPFormDNS(char *domain); #endif diff --git a/src/net/tcp.h b/src/net/tcp.h index 1c551ea..4dcc5f4 100644 --- a/src/net/tcp.h +++ b/src/net/tcp.h @@ -6,7 +6,7 @@ #include #include -#include +#include #define SUPPORT_IPv6 @@ -15,26 +15,26 @@ typedef struct struct_sock_tcp_t { - int sock; - int proto; + int sock; + int proto; - struct sockaddr_in sockAddr; + struct sockaddr_in sockAddr; #ifdef SUPPORT_IPv6 - struct sockaddr_in6 sockAddr6; + struct sockaddr_in6 sockAddr6; #endif } sock_tcp_t; -extern sock_tcp_t* newSockTcp(int proto); -extern void destroySockTcp(sock_tcp_t *p); -extern sock_tcp_t* bindTcpSocket(char *addresss, int port, int proto); -extern sock_tcp_t* getTcpNewClient(sock_tcp_t *p); -extern void getSockTcpIp(sock_tcp_t *p, char *str_ip, int len); -extern int getSockTcpPort(sock_tcp_t *p); -extern sock_tcp_t* connectTcpSocket(char *ip, int port, int proto); -extern int disableNagle(sock_tcp_t *p); -extern int setTcpSockNonBlock(sock_tcp_t *p); -extern int readTcpSocket(sock_tcp_t *p, void *address, int len); -extern int writeTcpSocket(sock_tcp_t *p, void *address, int len); -extern void closeTcpSocket(sock_tcp_t *p); +extern sock_tcp_t *newSockTcp(int proto); +extern void destroySockTcp(sock_tcp_t * p); +extern sock_tcp_t *bindTcpSocket(char *addresss, int port, int proto); +extern sock_tcp_t *getTcpNewClient(sock_tcp_t * p); +extern void getSockTcpIp(sock_tcp_t * p, char *str_ip, int len); +extern int getSockTcpPort(sock_tcp_t * p); +extern sock_tcp_t *connectTcpSocket(char *ip, int port, int proto); +extern int disableNagle(sock_tcp_t * p); +extern int setTcpSockNonBlock(sock_tcp_t * p); +extern int readTcpSocket(sock_tcp_t * p, void *address, int len); +extern int writeTcpSocket(sock_tcp_t * p, void *address, int len); +extern void closeTcpSocket(sock_tcp_t * p); #endif diff --git a/src/net/udp.h b/src/net/udp.h index 29f5809..827c1c8 100644 --- a/src/net/udp.h +++ b/src/net/udp.h @@ -17,26 +17,28 @@ typedef struct struct_sock_udp_t { #ifndef __WIN32__ - int sock; + int sock; #else - SOCKET sock; + SOCKET sock; #endif - int proto; + int proto; #ifdef SUPPORT_IPv6 - struct sockaddr_in6 sockAddr6; + struct sockaddr_in6 sockAddr6; #endif - struct sockaddr_in sockAddr; + struct sockaddr_in sockAddr; } sock_udp_t; -extern sock_udp_t* newSockUdp(int proto); -extern void destroySockUdp(sock_udp_t *p); -extern sock_udp_t* bindUdpSocket(char *address, int port, int proto); -extern sock_udp_t* connectUdpSocket(char *address, int port, int proto); -extern int setUdpSockNonBlock(sock_udp_t *p); -extern int readUdpSocket(sock_udp_t *src, sock_udp_t *dst, void *address, int len); -extern int writeUdpSocket(sock_udp_t *src, sock_udp_t *dst, void *address, int len); -extern void getSockUdpIp(sock_udp_t *p, char *str_ip, int len); -extern int getSockUdpPort(sock_udp_t *p); -extern void closeUdpSocket(sock_udp_t *p); +extern sock_udp_t *newSockUdp(int proto); +extern void destroySockUdp(sock_udp_t * p); +extern sock_udp_t *bindUdpSocket(char *address, int port, int proto); +extern sock_udp_t *connectUdpSocket(char *address, int port, int proto); +extern int setUdpSockNonBlock(sock_udp_t * p); +extern int readUdpSocket(sock_udp_t * src, sock_udp_t * dst, void *address, + int len); +extern int writeUdpSocket(sock_udp_t * src, sock_udp_t * dst, void *address, + int len); +extern void getSockUdpIp(sock_udp_t * p, char *str_ip, int len); +extern int getSockUdpPort(sock_udp_t * p); +extern void closeUdpSocket(sock_udp_t * p); #endif 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(); diff --git a/src/server/heightScore.h b/src/server/heightScore.h index b1bf7e2..4748264 100644 --- a/src/server/heightScore.h +++ b/src/server/heightScore.h @@ -7,7 +7,7 @@ extern void initHeightScore(char *file); extern int addPlayerInHighScore(char *name, int score); -extern char* getTableItem(int index); +extern char *getTableItem(int index); extern void quitHeightScore(); #endif diff --git a/src/server/publicServer.h b/src/server/publicServer.h index f6aa29c..9bf97fc 100644 --- a/src/server/publicServer.h +++ b/src/server/publicServer.h @@ -11,7 +11,7 @@ extern char *getSetting(char *env, char *param, char *default_val); extern void countRoundInc(); extern int initPublicServer(); -extern arenaFile_t* getChoiceArena(); +extern arenaFile_t *getChoiceArena(); extern void eventPublicServer(); extern void my_handler_quit(int n); extern void quitPublicServer(); diff --git a/src/server/serverConfigFile.h b/src/server/serverConfigFile.h index d016807..7021a6b 100644 --- a/src/server/serverConfigFile.h +++ b/src/server/serverConfigFile.h @@ -5,7 +5,7 @@ #define SERVER_CONFIG_FILE_H extern void initServerConfigFile(); -extern char* getServerConfigFileValue(char *env, char *s); +extern char *getServerConfigFileValue(char *env, char *s); extern void quitServerConfigFile(); #endif diff --git a/src/widget/widget.h b/src/widget/widget.h index 0fcb86c..05fce33 100644 --- a/src/widget/widget.h +++ b/src/widget/widget.h @@ -17,17 +17,18 @@ typedef struct widget_struct { - int type; - int x, y; - int w, h; - void *private_data; + int type; + int x, y; + int w, h; + void *private_data; } widget_t; -extern widget_t* newWidget(int type, int x, int y, int w, int h, void *private_data); -extern void widgetSetLocation(widget_t *p, int x, int y); -extern void widgetGetLocation(widget_t *p, int *x, int *y); -extern void widgetSetSize(widget_t *p, int w, int h); -extern void widgetGetSize(widget_t *p, int *w, int *h); -extern void destroyWidget(widget_t *p); +extern widget_t *newWidget(int type, int x, int y, int w, int h, + void *private_data); +extern void widgetSetLocation(widget_t * p, int x, int y); +extern void widgetGetLocation(widget_t * p, int *x, int *y); +extern void widgetSetSize(widget_t * p, int w, int h); +extern void widgetGetSize(widget_t * p, int *w, int *h); +extern void destroyWidget(widget_t * p); #endif diff --git a/src/widget/widget_button.h b/src/widget/widget_button.h index 4bdf7c0..a0e50db 100644 --- a/src/widget/widget_button.h +++ b/src/widget/widget_button.h @@ -13,14 +13,15 @@ typedef struct widget_button { - char *text; - int w, h; - void (*fce_event)(void *); + char *text; + int w, h; + void (*fce_event) (void *); } widget_button_t; -extern widget_t* newWidgetButton(char *text, int x, int y, void (*fce_event)(void *)); -extern void drawWidgetButton(widget_t *widget); -extern void eventWidgetButton(widget_t *widget); -extern void destroyWidgetButton(widget_t *widget); +extern widget_t *newWidgetButton(char *text, int x, int y, + void (*fce_event) (void *)); +extern void drawWidgetButton(widget_t * widget); +extern void eventWidgetButton(widget_t * widget); +extern void destroyWidgetButton(widget_t * widget); #endif diff --git a/src/widget/widget_buttonimage.h b/src/widget/widget_buttonimage.h index c57b143..a607127 100644 --- a/src/widget/widget_buttonimage.h +++ b/src/widget/widget_buttonimage.h @@ -11,18 +11,18 @@ typedef struct widget_buttonimageimage { - int w, h; - int active; - image_t *image; - void (*fce_event)(void *); + int w, h; + int active; + image_t *image; + void (*fce_event) (void *); } widget_buttonimage_t; -extern widget_t* newWidgetButtonimage(image_t *image, int x, int y, - void (*fce_event)(void *)); +extern widget_t *newWidgetButtonimage(image_t * image, int x, int y, + void (*fce_event) (void *)); -extern void setWidgetButtonimageActive(widget_t *widget, bool_t active); -extern void drawWidgetButtonimage(widget_t *widget); -extern void eventWidgetButtonimage(widget_t *widget); -extern void destroyWidgetButtonimage(widget_t *widget); +extern void setWidgetButtonimageActive(widget_t * widget, bool_t active); +extern void drawWidgetButtonimage(widget_t * widget); +extern void eventWidgetButtonimage(widget_t * widget); +extern void destroyWidgetButtonimage(widget_t * widget); #endif diff --git a/src/widget/widget_catchkey.h b/src/widget/widget_catchkey.h index cec2110..1b318c6 100644 --- a/src/widget/widget_catchkey.h +++ b/src/widget/widget_catchkey.h @@ -12,17 +12,17 @@ typedef struct widget_catchkey_struct { - int w, h; - int key; - bool_t active; - void (*fce_event)(void *p); + int w, h; + int key; + bool_t active; + void (*fce_event) (void *p); } widget_catchkey_t; -extern widget_t* newWidgetCatchkey(int key, int x, int y, void *event); -extern int getWidgetCatchKey(widget_t *p); -extern void setWidgetCatchKey(widget_t *p, int key); -extern void drawWidgetCatchkey(widget_t *p); -extern void eventWidgetCatchkey(widget_t *p); -extern void destroyWidgetCatchkey(widget_t *p); +extern widget_t *newWidgetCatchkey(int key, int x, int y, void *event); +extern int getWidgetCatchKey(widget_t * p); +extern void setWidgetCatchKey(widget_t * p, int key); +extern void drawWidgetCatchkey(widget_t * p); +extern void eventWidgetCatchkey(widget_t * p); +extern void destroyWidgetCatchkey(widget_t * p); #endif diff --git a/src/widget/widget_check.h b/src/widget/widget_check.h index c8b13b0..df42001 100644 --- a/src/widget/widget_check.h +++ b/src/widget/widget_check.h @@ -13,17 +13,17 @@ typedef struct widget_check { - bool_t status; - int time; - void (*fce_event)(void *); + bool_t status; + int time; + void (*fce_event) (void *); } widget_check_t; -extern widget_t* newWidgetCheck(int x, int y, bool_t status, void (*fce_event)(void *)); -extern void drawWidgetCheck(widget_t *widget); -extern void eventWidgetCheck(widget_t *widget); -extern bool_t getWidgetCheckStatus(widget_t *widget); -extern void setWidgetCheckStatus(widget_t *widget, bool_t status); -extern void destroyWidgetCheck(widget_t *widget); +extern widget_t *newWidgetCheck(int x, int y, bool_t status, + void (*fce_event) (void *)); +extern void drawWidgetCheck(widget_t * widget); +extern void eventWidgetCheck(widget_t * widget); +extern bool_t getWidgetCheckStatus(widget_t * widget); +extern void setWidgetCheckStatus(widget_t * widget, bool_t status); +extern void destroyWidgetCheck(widget_t * widget); #endif - diff --git a/src/widget/widget_choicegroup.h b/src/widget/widget_choicegroup.h index 05e6532..8cc6764 100644 --- a/src/widget/widget_choicegroup.h +++ b/src/widget/widget_choicegroup.h @@ -14,21 +14,21 @@ typedef struct widget_choicegroup { - bool_t status; - int time; - void (*fce_event)(void *); - list_t *list; + bool_t status; + int time; + void (*fce_event) (void *); + list_t *list; } widget_choicegroup_t; -extern widget_t* newWidgetChoicegroup(int x, int y, bool_t status, - list_t *list, void (*fce_event)(void *)); +extern widget_t *newWidgetChoicegroup(int x, int y, bool_t status, + list_t * list, + void (*fce_event) (void *)); -extern void drawWidgetChoicegroup(widget_t *p); -extern void setWidgetChoiceActive(widget_t *widget); -extern bool_t getWidgetChoiceStatus(widget_t *widget); -extern void setWidgetChoiceStatus(widget_t *widget, bool_t status); -extern void eventWidgetChoicegroup(widget_t *p); -extern void destroyWidgetChoicegroup(widget_t *p); +extern void drawWidgetChoicegroup(widget_t * p); +extern void setWidgetChoiceActive(widget_t * widget); +extern bool_t getWidgetChoiceStatus(widget_t * widget); +extern void setWidgetChoiceStatus(widget_t * widget, bool_t status); +extern void eventWidgetChoicegroup(widget_t * p); +extern void destroyWidgetChoicegroup(widget_t * p); #endif - diff --git a/src/widget/widget_image.h b/src/widget/widget_image.h index 6f661e4..86cf6bc 100644 --- a/src/widget/widget_image.h +++ b/src/widget/widget_image.h @@ -9,13 +9,12 @@ typedef struct widget_image { - image_t *image; + image_t *image; } widget_image_t; -extern widget_t* newWidgetImage(int x, int y, image_t *image); -extern void drawWidgetImage(widget_t *p); -extern void eventWidgetImage(widget_t *p); -extern void destroyWidgetImage(widget_t *p); +extern widget_t *newWidgetImage(int x, int y, image_t * image); +extern void drawWidgetImage(widget_t * p); +extern void eventWidgetImage(widget_t * p); +extern void destroyWidgetImage(widget_t * p); #endif - diff --git a/src/widget/widget_label.h b/src/widget/widget_label.h index 0893d68..8ad29b5 100644 --- a/src/widget/widget_label.h +++ b/src/widget/widget_label.h @@ -8,18 +8,18 @@ typedef struct widget_label { - int w, h; - char *text; - int bind; + int w, h; + char *text; + int bind; } widget_label_t; #define WIDGET_LABEL_RIGHT 1 #define WIDGET_LABEL_LEFT 2 #define WIDGET_LABEL_CENTER 3 -extern widget_t* newWidgetLabel(char *text, int x, int y, int bind); -extern void drawWidgetLabel(widget_t *widget); -extern void eventWidgetLabel(widget_t *widget); -extern void destroyWidgetLabel(widget_t *widget); +extern widget_t *newWidgetLabel(char *text, int x, int y, int bind); +extern void drawWidgetLabel(widget_t * widget); +extern void eventWidgetLabel(widget_t * widget); +extern void destroyWidgetLabel(widget_t * widget); #endif diff --git a/src/widget/widget_select.h b/src/widget/widget_select.h index a0be1b1..ba7b9d4 100644 --- a/src/widget/widget_select.h +++ b/src/widget/widget_select.h @@ -9,20 +9,19 @@ typedef struct widget_select { - int w, h; - list_t *list; - int select; - void (*fce_event)(void *); + int w, h; + list_t *list; + int select; + void (*fce_event) (void *); } widget_select_t; -extern widget_t* newWidgetSelect(int x, int y, void (*fce_event)(void *)); -extern char* getWidgetSelectItem(widget_t *widget); -extern int getWidgetSelectIndex(widget_t *widget); -extern void addToWidgetSelect(widget_t *widget, char *s); -extern void removeAllFromWidgetSelect(widget_t *widget); -extern void drawWidgetSelect(widget_t *widget); -extern void eventWidgetSelect(widget_t *widget); -extern void destroyWidgetSelect(widget_t *widget); +extern widget_t *newWidgetSelect(int x, int y, void (*fce_event) (void *)); +extern char *getWidgetSelectItem(widget_t * widget); +extern int getWidgetSelectIndex(widget_t * widget); +extern void addToWidgetSelect(widget_t * widget, char *s); +extern void removeAllFromWidgetSelect(widget_t * widget); +extern void drawWidgetSelect(widget_t * widget); +extern void eventWidgetSelect(widget_t * widget); +extern void destroyWidgetSelect(widget_t * widget); #endif - diff --git a/src/widget/widget_textfield.h b/src/widget/widget_textfield.h index 00a147b..be46ea0 100644 --- a/src/widget/widget_textfield.h +++ b/src/widget/widget_textfield.h @@ -22,22 +22,21 @@ typedef struct widget_textfield { - int w, h; - int canWrite; - int timeBlick; - int time; - int atime; - int filter; - char text[STR_SIZE]; - bool_t active; + int w, h; + int canWrite; + int timeBlick; + int time; + int atime; + int filter; + char text[STR_SIZE]; + bool_t active; } widget_textfield_t; -extern widget_t* newWidgetTextfield(char *text, int filter, int x, int y); -extern void setWidgetTextFiledText(widget_t *widget, char *text); -extern char* getTextFromWidgetTextfield(widget_t *widget); -extern void drawWidgetTextfield(widget_t *widget); -extern void eventWidgetTextfield(widget_t *widget); -extern void destroyWidgetTextfield(widget_t *widget); +extern widget_t *newWidgetTextfield(char *text, int filter, int x, int y); +extern void setWidgetTextFiledText(widget_t * widget, char *text); +extern char *getTextFromWidgetTextfield(widget_t * widget); +extern void drawWidgetTextfield(widget_t * widget); +extern void eventWidgetTextfield(widget_t * widget); +extern void destroyWidgetTextfield(widget_t * widget); #endif - -- cgit v1.2.3