diff options
Diffstat (limited to 'src/client')
| -rw-r--r-- | src/client/client.h | 1 | ||||
| -rw-r--r-- | src/client/configFile.h | 12 | ||||
| -rwxr-xr-x | src/client/font.h | 7 | ||||
| -rw-r--r-- | src/client/hotKey.h | 2 | ||||
| -rwxr-xr-x | src/client/image.h | 13 | ||||
| -rwxr-xr-x | src/client/interface.h | 2 | ||||
| -rw-r--r-- | src/client/keyboardBuffer.h | 13 | ||||
| -rwxr-xr-x | src/client/layer.h | 28 | ||||
| -rw-r--r-- | src/client/panel.h | 2 | ||||
| -rw-r--r-- | src/client/radar.h | 2 | ||||
| -rw-r--r-- | src/client/saveLoad.h | 2 | ||||
| -rw-r--r-- | src/client/screen.h | 22 |
12 files changed, 55 insertions, 51 deletions
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 <SDL.h> #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(); |