Rectified the coding style in base .h files

31 files changed, 560 insertions, 599 deletions

diff --git a/src/base/archive.h b/src/base/archive.h
index f7c2b46..e2ad361 100644
--- a/src/base/archive.h
+++ b/src/base/archive.h
@@ -1,9 +1,7 @@
-
 #ifndef ARCHIVE_H
-
-#    define ARCHIVE_H
+#define ARCHIVE_H
 
 extern char *archive_extract_file(char *archive, char *file);
 extern void archive_delete_file(char *s);
 
-#endif
+#endif /* ARCHIVE_H */
diff --git a/src/base/arena.h b/src/base/arena.h
index 153fb3b..a01484a 100644
--- a/src/base/arena.h
+++ b/src/base/arena.h
@@ -1,30 +1,28 @@
-
 #ifndef ARENA_H
+#define ARENA_H
 
-#    define ARENA_H
-
-#    include "main.h"
+#include "main.h"
 
-#    ifndef PUBLIC_SERVER
-#        include "image.h"
-#    endif
+#ifndef PUBLIC_SERVER
+#include "image.h"
+#endif /* PUBLIC_SERVER */
 
-#    ifdef __WIN32__
-#        define random rand
-#    endif
+#include "list.h"
+#include "space.h"
 
-#    define SCREEN_SPLIT_HORIZONTAL		1
-#    define SCREEN_SPLIT_VERTICAL		2
+#ifdef __WIN32__
+#define random rand
+#endif /* __WIN32__ */
 
-#    include "list.h"
-#    include "space.h"
+#define SCREEN_SPLIT_HORIZONTAL		1
+#define SCREEN_SPLIT_VERTICAL		2
 
 typedef struct arena_struct {
-#    ifndef PUBLIC_SERVER
+#ifndef PUBLIC_SERVER
 	char music[STR_SIZE];
 
 	image_t *background;
-#    endif
+#endif /* PUBLIC_SERVER */
 	int w, h;
 
 	list_t *listTimer;
@@ -35,24 +33,23 @@ typedef struct arena_struct {
 
 	int countRound;
 	int max_countRound;
-
 } arena_t;
 
-extern void arena_set_current(arena_t * p);
+extern void arena_set_current(arena_t *p);
 extern arena_t *arena_get_current();
 extern void arena_init();
 extern void arena_quit();
 extern arena_t *arena_new(int w, int h);
-extern int arena_conflict_space(int x1, int y1, int w1, int h1, int x2, int y2,
-						 int w2, int h2);
-extern int arena_is_free_space(arena_t * arena, int x, int y, int w, int h);
-extern void arena_find_free_space(arena_t * arena, int *x, int *y, int w, int h);
+extern int arena_conflict_space(int x1, int y1, int w1, int h1,
+				int x2, int y2, int w2, int h2);
+extern int arena_is_free_space(arena_t *arena, int x, int y, int w, int h);
+extern void arena_find_free_space(arena_t *arena, int *x, int *y, int w, int h);
 extern void arena_get_center_screen(int *screen_x, int *screen_y, int x, int y,
-							int screen_size_x, int screen_size_y);
-#    ifndef PUBLIC_SERVER
-extern void arena_draw(arena_t * arena);
-#    endif
-extern void arena_event(arena_t * arena);
-extern void arena_destroy(arena_t * p);
-
-#endif
+				    int screen_size_x, int screen_size_y);
+#ifndef PUBLIC_SERVER
+extern void arena_draw(arena_t *arena);
+#endif /* PUBLIC_SERVER */
+extern void arena_event(arena_t *arena);
+extern void arena_destroy(arena_t *p);
+
+#endif /* ARENA_H */
diff --git a/src/base/arenaFile.h b/src/base/arenaFile.h
index 7de4f3f..3cbc82a 100644
--- a/src/base/arenaFile.h
+++ b/src/base/arenaFile.h
@@ -1,12 +1,10 @@
-
 #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;
@@ -20,10 +18,10 @@ extern char *arena_file_get_name(arenaFile_t * arenaFile);
 extern char *arena_file_get_net_name(arenaFile_t * arenaFile);
 extern arenaFile_t *arena_file_get_file_format_net_name(char *s);
 extern char *arena_file_get_image(arenaFile_t * arenaFile);
-#    ifndef PUBLIC_SERVER
-extern image_t *arena_file_load_image(arenaFile_t * arenaFile, char *filename,
-								   char *group, char *name, int alpha);
-#    endif
+#ifndef PUBLIC_SERVER
+extern image_t *arena_file_load_image(arenaFile_t *arenaFile, char *filename,
+				      char *group, char *name, int alpha);
+#endif /* PUBLIC_SERVER */
 extern arenaFile_t *arena_file_get(int n);
 extern int arena_file_get_id(arenaFile_t * arenaFile);
 extern arena_t *arena_file_get_arena(arenaFile_t * arenaFile);
@@ -32,4 +30,4 @@ extern void arena_file_load(char *path);
 extern void arena_file_init();
 extern void arena_file_quit();
 
-#endif
+#endif /* ARENA_FILE_H */
diff --git a/src/base/bool.h b/src/base/bool.h
index 7334348..76a3756 100644
--- a/src/base/bool.h
+++ b/src/base/bool.h
@@ -1,9 +1,10 @@
-
 #ifndef BOOL_H
-#    define BOOL_H
-#    define bool_t int
-#    define TRUE	1
-#    define FALSE	0
+#define BOOL_H
+
+#include "main.h"
+
+#define bool_t	int
+#define TRUE	1
+#define FALSE	0
 
-#    include "main.h"
-#endif
+#endif /* BOOL_H */
diff --git a/src/base/buffer.h b/src/base/buffer.h
index 1aabfc7..9ddc5e6 100644
--- a/src/base/buffer.h
+++ b/src/base/buffer.h
@@ -1,9 +1,7 @@
-
 #ifndef BUFFER_H
+#define BUFFER_H
 
-#    define BUFFER_H
-
-#    define BUFFER_LIMIT_ALLOC 1024
+#define BUFFER_LIMIT_ALLOC	1024
 
 typedef struct str_buffer {
 	char *data;
@@ -12,13 +10,13 @@ typedef struct str_buffer {
 } buffer_t;
 
 extern buffer_t *buffer_new(int n);
-extern void *buffer_get_data(buffer_t * p);
-extern int buffer_get_size(buffer_t * p);
-extern int buffer_append(buffer_t * p, char *data, int len);
-extern int buffer_cut(buffer_t * p, int len);
-extern int buffer_count_line(buffer_t * p);
-extern int buffer_get_line(buffer_t * p, char *line, int len);
-extern int buffer_get_data_len(buffer_t * p, char *line, int len);
-extern void buffer_destroy(buffer_t * p);
+extern void *buffer_get_data(buffer_t *p);
+extern int buffer_get_size(buffer_t *p);
+extern int buffer_append(buffer_t *p, char *data, int len);
+extern int buffer_cut(buffer_t *p, int len);
+extern int buffer_count_line(buffer_t *p);
+extern int buffer_get_line(buffer_t *p, char *line, int len);
+extern int buffer_get_data_len(buffer_t *p, char *line, int len);
+extern void buffer_destroy(buffer_t *p);
 
-#endif
+#endif /* BUFFER_H */
diff --git a/src/base/checkFront.h b/src/base/checkFront.h
index cde6cfd..a65d532 100644
--- a/src/base/checkFront.h
+++ b/src/base/checkFront.h
@@ -1,21 +1,20 @@
-
 #ifndef CHECK_FRONT_H
+#define CHECK_FRONT_H
 
-#    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
+#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 *check_front_new();
-extern void check_front_msg_add(list_t * list, char *msg, int type, int id);
-extern void check_front_event(client_t * client);
-extern void check_front_del_msg(list_t * listCheckFront, int id);
-extern void check_front_destroy(list_t * p);
+extern void check_front_msg_add(list_t *list, char *msg, int type, int id);
+extern void check_front_event(client_t *client);
+extern void check_front_del_msg(list_t *listCheckFront, int id);
+extern void check_front_destroy(list_t *p);
 
-#endif
+#endif /* CHECK_FRONT_H */
diff --git a/src/base/director.h b/src/base/director.h
index 5eb2a9c..18c15e9 100644
--- a/src/base/director.h
+++ b/src/base/director.h
@@ -1,9 +1,8 @@
-
 #ifndef DIRECTOR_H
-#    define DIRECTOR_H
+#define DIRECTOR_H
 
-#    include "main.h"
-#    include "list.h"
+#include "main.h"
+#include "list.h"
 
 typedef struct director_struct {
 	char *path;
@@ -12,4 +11,5 @@ typedef struct director_struct {
 
 extern director_t *director_load(char *s);
 extern void director_destroy(director_t * p);
-#endif
+
+#endif /* DIRECTOR_H */
diff --git a/src/base/downServer.h b/src/base/downServer.h
index da5a698..9207ef5 100644
--- a/src/base/downServer.h
+++ b/src/base/downServer.h
@@ -1,6 +1,4 @@
-
 #ifndef DOWN_SERVER_H
-
 #define DOWN_SERVER_H
 
 #include "list.h"
@@ -12,4 +10,4 @@ extern int down_server_set_select();
 extern int down_server_select_socket();
 extern int down_server_quit();
 
-#endif
+#endif /* DOWN_SERVER_H */
diff --git a/src/base/gun.h b/src/base/gun.h
index 46a7d29..94d2cc9 100644
--- a/src/base/gun.h
+++ b/src/base/gun.h
@@ -1,15 +1,16 @@
-
 #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
-
-#    include "main.h"
-#    include "tux.h"
-
-extern void gun_shot(tux_t * p);
-#endif
+#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 gun_shot(tux_t *p);
+
+#endif /* GUN_H */
diff --git a/src/base/homeDirector.h b/src/base/homeDirector.h
index 5a9cc98..e89f0af 100644
--- a/src/base/homeDirector.h
+++ b/src/base/homeDirector.h
@@ -1,10 +1,11 @@
-
 #ifndef HOMEDIRECTOR_H
-#    define HOMEDIRECTOR_H
-#    define HOMEDIRECTOR_NAME ".tuxanci"
+#define HOMEDIRECTOR_H
+
+#include "main.h"
 
-#    include "main.h"
+#define HOMEDIRECTOR_NAME ".tuxanci"
 
 extern void home_director_create();
 extern char *home_director_get();
-#endif
+
+#endif /* HOMEDIRECTOR_H */
diff --git a/src/base/idManager.h b/src/base/idManager.h
index c4b6968..4ad2abc 100644
--- a/src/base/idManager.h
+++ b/src/base/idManager.h
@@ -1,12 +1,14 @@
-
 #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"
+#define ID_MANAGER_H
+
+#include "list.h"
+
+#define MAX_ID		1000000
+#define ID_UNKNOWN	-1
+
+#ifdef __WIN32__
+#define random rand
+#endif /* __WIN32__ */
 
 extern void id_init_list();
 extern int id_is_register(int id);
@@ -17,4 +19,4 @@ extern void id_del(int id);
 extern void id_replace(int old_id, int new_id);
 extern void id_quit_list();
 
-#endif
+#endif /* ID_MANAGER_H */
diff --git a/src/base/index.h b/src/base/index.h
index 9b6f2f7..4bb1c1b 100644
--- a/src/base/index.h
+++ b/src/base/index.h
@@ -1,10 +1,8 @@
-
 #ifndef INDEX_H
+#define INDEX_H
 
-#    define INDEX_H
-
-#    include "main.h"
-#    include "list.h"
+#include "main.h"
+#include "list.h"
 
 typedef struct index_item_struct {
 	int key;
@@ -12,12 +10,12 @@ typedef struct index_item_struct {
 } index_item_t;
 
 extern list_t *index_new();
-extern void index_add(list_t * list, int key, void *data);
-extern void *index_get(list_t * list, int key);
-extern void index_del(list_t * list, int key);
-extern void index_del_with_object(list_t * list, int key, void *f);
-extern void index_action(list_t * list, void *f);
-extern void index_destroy(list_t * list);
-extern void index_destroyWithObject(list_t * list, void *f);
+extern void index_add(list_t *list, int key, void *data);
+extern void *index_get(list_t *list, int key);
+extern void index_del(list_t *list, int key);
+extern void index_del_with_object(list_t *list, int key, void *f);
+extern void index_action(list_t *list, void *f);
+extern void index_destroy(list_t *list);
+extern void index_destroyWithObject(list_t *list, void *f);
 
-#endif
+#endif /* INDEX_H */
diff --git a/src/base/item.h b/src/base/item.h
index f471bad..48f2930 100644
--- a/src/base/item.h
+++ b/src/base/item.h
@@ -1,51 +1,57 @@
-
 #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
+
+#include "main.h"
+
+#ifndef PUBLIC_SERVER
+#include "image.h"
+#endif /* PUBLIC_SERVER */
+
+#include "list.h"
+#include "tux.h"
+#include "myTimer.h"
+
+#define ITEM_SYNC_TIMEOUT		5000
 
-#    include "main.h"
-#    ifndef PUBLIC_SERVER
-#        include "image.h"
-#    endif
-#    include "list.h"
-#    include "tux.h"
-#    include "myTimer.h"
+#ifdef __WIN32__
+#define random rand
+#endif /* __WIN32__ */
+
+#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
 
 typedef struct item_struct {
 	int id;
-	int type;					// type of thing
+	int type;			/* type of the item */
 
-	int x;						// item position 
+	/* position */
+	int x;
 	int y;
 
-	int w;						// item size
+	/* size */
+	int w;
 	int h;
 
-	int frame;					//number of animation
+	int frame;			/* number of animation frames */
 	int count;
 
 	int author_id;
-#    ifndef PUBLIC_SERVER
-	image_t *img;				//picture
-#    endif
+#ifndef PUBLIC_SERVER
+	image_t *img;			/* picture of the item*/
+#endif
 } item_t;
 
 extern bool_t item_is_inicialized();
@@ -53,16 +59,17 @@ extern void item_init();
 extern item_t *item_new(int x, int y, int type, int author_id);
 extern void item_get_status(void *p, int *id, int *x, int *y, int *w, int *h);
 extern void item_set_status(void *p, int x, int y, int w, int h);
-extern void item_replace_id(item_t * item, int id);
-extern void item_add_new_item(space_t * spaceItem, int author_id);
-#    ifndef PUBLIC_SERVER
-extern void item_draw(item_t * p);
-extern void item_draw_list(list_t * listItem);
-#    endif
-extern void item_event(space_t * listSpace);
-extern void item_event_conglicts_shot_with_item(arena_t * arena);
-extern void item_event_tux_give_item(tux_t * tux, item_t * item, space_t * spaceItem);
-extern void item_tux_give_list_item(tux_t * tux, space_t * spaceItem);
-extern void item_destroy(item_t * p);
+extern void item_replace_id(item_t *item, int id);
+extern void item_add_new_item(space_t *spaceItem, int author_id);
+#ifndef PUBLIC_SERVER
+extern void item_draw(item_t *p);
+extern void item_draw_list(list_t *listItem);
+#endif /* PUBLIC_SERVER */
+extern void item_event(space_t *listSpace);
+extern void item_event_conglicts_shot_with_item(arena_t *arena);
+extern void item_event_tux_give_item(tux_t *tux, item_t *item, space_t *spaceItem);
+extern void item_tux_give_list_item(tux_t *tux, space_t *spaceItem);
+extern void item_destroy(item_t *p);
 extern void item_quiy();
-#endif
+
+#endif /* ITEM_H */
diff --git a/src/base/list.h b/src/base/list.h
index 337f1cd..7c9c610 100644
--- a/src/base/list.h
+++ b/src/base/list.h
@@ -1,9 +1,9 @@
-
 #ifndef LIST_H
-#    define LIST_H
-#    define LIST_ALLOC_LIMIT 16
+#define LIST_H
+
+#include "main.h"
 
-#    include "main.h"
+#define LIST_ALLOC_LIMIT 16
 
 typedef struct list_str {
 	void **list;
@@ -12,15 +12,16 @@ typedef struct list_str {
 } list_t;
 
 extern list_t *list_new();
-extern list_t *list_clone(list_t * p);
-extern list_t *list_clone_item(list_t * p, void *f);
-extern void list_add(list_t * p, void *item);
-extern void list_ins(list_t * p, int n, void *item);
-extern void *list_get(list_t * p, int n);
-extern int list_search(list_t * p, void *n);
-extern void list_del(list_t * p, int n);
-extern void list_del_item(list_t * p, int n, void *f);
-extern void list_do_empty(list_t * p);
-extern void list_destroy(list_t * p);
-extern void list_destroy_item(list_t * p, void *f);
-#endif
+extern list_t *list_clone(list_t *p);
+extern list_t *list_clone_item(list_t *p, void *f);
+extern void list_add(list_t *p, void *item);
+extern void list_ins(list_t *p, int n, void *item);
+extern void *list_get(list_t *p, int n);
+extern int list_search(list_t *p, void *n);
+extern void list_del(list_t *p, int n);
+extern void list_del_item(list_t *p, int n, void *f);
+extern void list_do_empty(list_t *p);
+extern void list_destroy(list_t *p);
+extern void list_destroy_item(list_t *p, void *f);
+
+#endif /* LIST_H */
diff --git a/src/base/main.h b/src/base/main.h
index 8ea3afa..fb23218 100644
--- a/src/base/main.h
+++ b/src/base/main.h
@@ -1,34 +1,31 @@
-
 #ifndef MAIN_H
-#    define MAIN_H
-#    define WINDOW_SIZE_X 800
-#    define WINDOW_SIZE_Y 600
-#    ifdef NLS
-#        define _(text) gettext(text)
-#    else
-#        define _(text) (text)
-#    endif
-
-#    ifdef NLS
-#        include <libintl.h>
-#        include <locale.h>
-#    endif
-#    include "bool.h"
-#    include "string_length.h"
-#    include "path.h"
-
-
-//#define SUPPORT_OPENGL
+#define MAIN_H
 
-#ifdef DEBUG
-#define DEBUG_MSG(msg,arg...) printf(msg, ##arg)
-#endif
+#ifdef NLS
+#include <libintl.h>
+#include <locale.h>
+#endif /* NLS */
+
+#include "bool.h"
+#include "string_length.h"
+#include "path.h"
+
+#define WINDOW_SIZE_X		800
+#define WINDOW_SIZE_Y		600
 
-#ifndef DEBUG
+#ifdef NLS
+#define _(text)			gettext(text)
+#else /* NLS */
+#define _(text)			(text)
+#endif /* NLS */
+
+#ifdef DEBUG
+#define DEBUG_MSG(msg,arg...)	printf(msg, ##arg)
+#else /* DEBUG */
 #define DEBUG_MSG(msg,arg...) 
-#endif
+#endif /* DEBUG */
 
-#define UNUSED(var)	if( 0 && var ){}
+#define UNUSED(var)		if (0 && var) {}
 
 
 extern char *getParam(char *s);
@@ -39,4 +36,5 @@ extern int *newInt(int x);
 extern int isFillPath(const char *path);
 extern void accessExistFile(const char *s);
 extern int tryExistFile(const char *s);
-#endif
+
+#endif /* MAIN_H */
diff --git a/src/base/modules.h b/src/base/modules.h
index 152ce14..4ac48b3 100644
--- a/src/base/modules.h
+++ b/src/base/modules.h
@@ -1,71 +1,67 @@
-
 #ifndef MODULE_H
+#define MODULE_H
 
-#    define MODULE_H
-
-#    include "tux.h"
-#    include "shot.h"
-#    include "arena.h"
-#    include "proto.h"
-#    include "myTimer.h"
+#include "tux.h"
+#include "shot.h"
+#include "arena.h"
+#include "proto.h"
+#include "myTimer.h"
 
-#    ifndef PUBLIC_SERVER
-#        include "image.h"
-#    endif
+#ifndef PUBLIC_SERVER
+#include "image.h"
+#endif /* PUBLIC_SERVER */
 
-#    define MODULE_TYPE_UNIX	".so"
-#    define MODULE_TYPE_APPLE	".dylib"
-#    define MODULE_TYPE_WIN		".dll"
+#define MODULE_TYPE_UNIX	".so"
+#define MODULE_TYPE_APPLE	".dylib"
+#define MODULE_TYPE_WIN		".dll"
 
 typedef struct export_fce_s {
 	int (*fce_getValue) (char *line, char *env, char *val, int len);
 
-#    ifndef PUBLIC_SERVER
+#ifndef PUBLIC_SERVER
 	image_t *(*fce_image_get) (char *group, char *name);
 
-	void (*fce_addLayer) (image_t * img,
-						  int x, int y, int px, int py,
-						  int w, int h, int player);
-#    endif
+	void (*fce_addLayer) (image_t *img, int x, int y, int px, int py,
+					    int w, int h, int player);
+#endif
 
 	int (*fce_net_multiplayer_get_game_type) ();
 	int (*fce_module_load_dep) (char *name);
 	void (*fce_share_function_add) (char *name, void *function);
 	void *(*fce_share_function_get) (char *name);
 
-	void (*fce_tux_get_proportion) (tux_t * tux, int *x, int *y, int *w, int *h);
-	void (*fce_tux_set_proportion) (tux_t * tux, int x, int y);
-	tux_t *(*fce_getTuxID) (list_t * listTux, int id);
-	void (*fce_tux_action) (tux_t * tux, int action);
+	void (*fce_tux_get_proportion) (tux_t *tux, int *x, int *y, int *w, int *h);
+	void (*fce_tux_set_proportion) (tux_t *tux, int x, int y);
+	tux_t *(*fce_getTuxID) (list_t *listTux, int id);
+	void (*fce_tux_action) (tux_t *tux, int action);
 
 	arena_t *(*fce_arena_get_current) ();
-	int (*fce_arena_conflict_space) (int x1, int y1, int w1, int h1, int x2, int y2,
-							  int w2, int h2);
-	int (*fce_arena_is_free_space) (arena_t * arena, int x, int y, int w, int h);
-	void (*fce_arena_find_free_space) (arena_t * arena, int *x, int *y, int w, int h);
-	void (*fce_proto_send_module_server) (int type, client_t * client,
-										  char *msg);
+	int (*fce_arena_conflict_space) (int x1, int y1, int w1, int h1,
+					 int x2, int y2, int w2, int h2);
+	int (*fce_arena_is_free_space) (arena_t *arena, int x, int y, int w, int h);
+	void (*fce_arena_find_free_space) (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_timer_get_current_time) ();
 
-	void (*fce_shot_destroy) (shot_t * p);
-	void (*fce_shot_bound_bombBall) (shot_t * shot);
-	void (*fce_shot_transform_lasser) (shot_t * shot);
+	void (*fce_shot_destroy) (shot_t *p);
+	void (*fce_shot_bound_bombBall) (shot_t *shot);
+	void (*fce_shot_transform_lasser) (shot_t *shot);
 } export_fce_t;
 
 typedef struct module_s {
 	char *name;
-#    ifndef __WIN32__
+#ifndef __WIN32__
 	void *image;
-#    else
+#else /* __WIN32__ */
 	HINSTANCE *image;
-#    endif
+#endif /* __WIN32__ */
 
-	int (*fce_init) (export_fce_t * p);
-#    ifndef PUBLIC_SERVER
+	int (*fce_init) (export_fce_t *p);
+#ifndef PUBLIC_SERVER
 	int (*fce_draw) (int x, int y, int w, int h);
-#    endif
+#endif /* PUBLIC_SERVER */
 	int (*fce_event) ();
 	int (*fce_isConflict) (int x, int y, int w, int h);
 	void (*fce_cmd) (char *line);
@@ -77,13 +73,13 @@ typedef struct module_s {
 extern void module_init();
 extern int module_load(char *name);
 extern int module_load_dep(char *name);
-#    ifndef PUBLIC_SERVER
+#ifndef PUBLIC_SERVER
 extern void module_draw(int x, int y, int w, int h);
-#    endif
+#endif /* PUBLIC_SERVER */
 extern void module_event();
 extern void module_cmd(char *s);
 extern int module_is_conflict(int x, int y, int w, int h);
 extern int module_recv_msg(char *msg);
 extern void module_quit();
 
-#endif
+#endif /* MODULES_H */
diff --git a/src/base/myTimer.h b/src/base/myTimer.h
index 7fc9d03..db05365 100644
--- a/src/base/myTimer.h
+++ b/src/base/myTimer.h
@@ -1,12 +1,12 @@
-
 #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
+
+#include "main.h"
+#include "list.h"
 
-#    include "main.h"
-#    include "list.h"
+#define my_time_t 	unsigned int
+#define TIMER_ONE	0
+#define TIMER_PERIODIC	1
 
 typedef struct my_timer_struct {
 	unsigned int id;
@@ -20,9 +20,10 @@ typedef struct my_timer_struct {
 extern list_t *timer_new();
 extern void timer_restart();
 extern my_time_t timer_get_current_time();
-extern int timer_add_task(list_t * listTimer, int type, void (*fce) (void *p),
-						  void *arg, my_time_t my_time);
-extern void timer_event(list_t * listTimer);
-extern void timer_del(list_t * listTimer, int id);
-extern void timer_destroy(list_t * listTimer);
-#endif
+extern int timer_add_task(list_t *listTimer, int type, void (*fce) (void *p),
+			  void *arg, my_time_t my_time);
+extern void timer_event(list_t *listTimer);
+extern void timer_del(list_t *listTimer, int id);
+extern void timer_destroy(list_t *listTimer);
+
+#endif /* MY_TIME_H */
diff --git a/src/base/net_multiplayer.h b/src/base/net_multiplayer.h
index 8d5ab46..3da7137 100644
--- a/src/base/net_multiplayer.h
+++ b/src/base/net_multiplayer.h
@@ -1,39 +1,37 @@
-
 #ifndef NET_MULTIPLAYER_H
+#define NET_MULTIPLAYER_H
 
-#    define NET_MULTIPLAYER_H
-
-#    include "main.h"
-#    include "tux.h"
-#    include "item.h"
-#    include "arena.h"
+#include "main.h"
+#include "tux.h"
+#include "item.h"
+#include "arena.h"
 
-#    define PROTO_UDPv4	0
-#    define PROTO_UDPv6	1
+#define PROTO_UDPv4			0
+#define PROTO_UDPv6			1
 
-#    define NET_GAME_TYPE_NONE		0
-#    define NET_GAME_TYPE_SERVER	1
-#    define NET_GAME_TYPE_CLIENT	2
+#define NET_GAME_TYPE_NONE		0
+#define NET_GAME_TYPE_SERVER		1
+#define NET_GAME_TYPE_CLIENT		2
 
-#    define NET_STATUS_OK		0
-#    define NET_STATUS_ZOMBIE		1
+#define NET_STATUS_OK			0
+#define NET_STATUS_ZOMBIE		1
 
-#    define NET_PROTOCOL_TYPE_TCP	0
-#    define NET_PROTOCOL_TYPE_UDP	1
+#define NET_PROTOCOL_TYPE_TCP		0
+#define NET_PROTOCOL_TYPE_UDP		1
 
-#    define  LIMIT_BUFFER 10240
+#define  LIMIT_BUFFER			10240
 
-#    define NET_MASTER_SERVER_DOMAIN	"ms.tuxanci.org"
-#    define NET_MASTER_SERVER		"193.85.244.165"
-#    define NET_MASTER_PORT		6800
+#define NET_MASTER_SERVER_DOMAIN	"ms.tuxanci.org"
+#define NET_MASTER_SERVER		"83.167.234.16"
+#define NET_MASTER_PORT			6800
 
-#    ifdef PUBLIC_SERVER
+#ifdef PUBLIC_SERVER
 extern int net_multiplayer_init_for_game_server(char *ip4, int port4, char *ip6, int port6);
-#    endif
+#endif /* PUBLIC_SERVER */
 
 extern int net_multiplayer_init(int type, char *ip, int port, int proto);
 extern int net_multiplayer_get_game_type();
 extern void net_multiplayer_event();
 extern void net_multiplayer_quit();
 
-#endif
+#endif /* NET_MULTIPLAYER_H */
diff --git a/src/base/protect.h b/src/base/protect.h
index 9a1cf1d..1a55ef7 100644
--- a/src/base/protect.h
+++ b/src/base/protect.h
@@ -1,12 +1,12 @@
-
 #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
+
+#include "main.h"
+#include "myTimer.h"
 
-#    include "main.h"
-#    include "myTimer.h"
+#define PROTECT_PING_INTERVAL_TIMEOUT	5000
+#define PROTECT_SPEED_INTERVAL_TIMEOUT	40
+#define PROTECT_SPEED_AVARAGE		10
 
 typedef struct protect_struct {
 	my_time_t lastPing;
@@ -17,8 +17,9 @@ typedef struct protect_struct {
 } 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);
-#endif
+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 /* PROTECT_H */
diff --git a/src/base/proto.h b/src/base/proto.h
index 8cd7568..a743b8c 100644
--- a/src/base/proto.h
+++ b/src/base/proto.h
@@ -1,105 +1,98 @@
-
-#ifndef MY_PROTO
-
-#    define MY_PROTO
-
-#    include <stdio.h>
-#    include <stdlib.h>
-#    include <string.h>
-#    include <assert.h>
-
-#    include "main.h"
-#    include "list.h"
-#    include "item.h"
-#    include "shot.h"
-#    include "arenaFile.h"
-#    include "myTimer.h"
-#    include "server.h"
-#    include "net_multiplayer.h"
-
-#    ifndef PUBLIC_SERVER
-#        include "world.h"
-#        include "setting.h"
-#        include "choiceArena.h"
-#        include "client.h"
-#    endif
-
-#    ifdef PUBLIC_SERVER
-#        include "publicServer.h"
-#    endif
-
-#    define PROTO_ERROR_CODE_UNKNOWN	0
-#    define PROTO_ERROR_CODE_BAD_VERSION	1
-#    define PROTO_ERROR_CODE_BAD_NAME	2
-#    define PROTO_ERROR_CODE_BAD_COMMAND	3
-#    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);
+#ifndef MY_PROTO_H
+#define MY_PROTO_H
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <assert.h>
+
+#include "main.h"
+#include "list.h"
+#include "item.h"
+#include "shot.h"
+#include "arenaFile.h"
+#include "myTimer.h"
+#include "server.h"
+#include "net_multiplayer.h"
+
+#ifndef PUBLIC_SERVER
+#include "world.h"
+#include "setting.h"
+#include "choiceArena.h"
+#include "client.h"
+#else /* PUBLIC_SERVER */
+#include "publicServer.h"
+#endif /* PUBLIC_SERVER */
+
+#define PROTO_ERROR_CODE_UNKNOWN	0
+#define PROTO_ERROR_CODE_BAD_VERSION	1
+#define PROTO_ERROR_CODE_BAD_NAME	2
+#define PROTO_ERROR_CODE_BAD_COMMAND	3
+#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_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
+#endif /* MY_PROTO_H */
diff --git a/src/base/server.h b/src/base/server.h
index 7768adc..8149121 100644
--- a/src/base/server.h
+++ b/src/base/server.h
@@ -1,31 +1,29 @@
+#ifndef MY_SERVER_H
+#define MY_SERVER_H
 
-#ifndef MY_SERVER
+#include <time.h>
 
-#    define MY_SERVER
+#include "list.h"
+#include "tux.h"
+#include "myTimer.h"
+#include "protect.h"
+#include "buffer.h"
 
-#    include <time.h>
+#ifndef PUBLIC_SERVER
+#include "interface.h"
+#endif /* PUBLIC_SERVER */
 
-#    include "list.h"
-#    include "tux.h"
-#    include "myTimer.h"
-#    include "protect.h"
-#    include "buffer.h"
+#include "udp.h"
 
-#    ifndef PUBLIC_SERVER
-#        include "interface.h"
-#    endif
+#define SERVER_TIMEOUT		1000
+#define SERVER_TIME_SYNC	1000
+#define SERVER_TIME_PING	1000
+#define SERVER_MAX_CLIENTS	100
 
-#    include "udp.h"
+#define SERVER_INDEX_ROOT_TUX	0
 
-#    define SERVER_TIMEOUT		1000
-#    define SERVER_TIME_SYNC	1000
-#    define SERVER_TIME_PING	1000
-#    define SERVER_MAX_CLIENTS	100
-
-#    define SERVER_INDEX_ROOT_TUX	0
-
-#    define CLIENT_TYPE_UDP		1
-#    define CLIENT_TYPE_TCP		2
+#define CLIENT_TYPE_UDP		1
+#define CLIENT_TYPE_TCP		2
 
 typedef struct client_struct {
 	int type;
@@ -50,13 +48,13 @@ typedef struct client_struct {
 extern int server_init(char *ip4, int port4, char *ip6, int port6);
 extern time_t server_get_update();
 extern client_t *server_new_any_client();
-extern void server_destroy_any_client(client_t * p);
+extern void server_destroy_any_client(client_t *p);
 extern list_t *server_get_list_clients();
 extern int server_get_max_clients();
 extern void server_set_time();
 extern void server_set_max_clients(int n);
-extern void server_send_client(client_t * p, char *msg);
+extern void server_send_client(client_t *p, char *msg);
 extern void server_event();
 extern void server_quit();
 
-#endif
+#endif /* MY_SERVER_H */
diff --git a/src/base/serverSelect.h b/src/base/serverSelect.h
index 15c8b37..e1880cb 100644
--- a/src/base/serverSelect.h
+++ b/src/base/serverSelect.h
@@ -1,7 +1,5 @@
-
-#ifndef SERVER_SELECT
-
-#    define SERVER_SELECT
+#ifndef SERVER_SELECT_H
+#define SERVER_SELECT_H
 
 extern void select_restart();
 extern void select_add_sock_for_read(int sock);
@@ -11,4 +9,4 @@ extern int select_is_change_sock(int sock);
 extern int select_is_change_sock_for_read(int sock);
 extern int select_is_change_sock_for_write(int sock);
 
-#endif
+#endif /* SERVER_SELECT_H */
diff --git a/src/base/serverSendMsg.h b/src/base/serverSendMsg.h
index a4506cd..68bd65c 100644
--- a/src/base/serverSendMsg.h
+++ b/src/base/serverSendMsg.h
@@ -1,16 +1,13 @@
-
 #ifndef SERVER_SEND_MSG_H
+#define SERVER_SEND_MSG_H
 
-#    define SERVER_SEND_MSG_H
-
-#    include "server.h"
+#include "server.h"
 
-#    define PROTO_SEND_ONE			0
-#    define PROTO_SEND_ALL			1
-#    define PROTO_SEND_BUT			3
-#    define PROTO_SEND_ALL_SEES_TUX		4
+#define PROTO_SEND_ONE			0
+#define PROTO_SEND_ALL			1
+#define PROTO_SEND_BUT			3
+#define PROTO_SEND_ALL_SEES_TUX		4
 
-extern void send_msg_to_client(int type, client_t * client, char *msg, int type2,
-							int id);
+extern void send_msg_to_client(int type, client_t *client, char *msg, int type2, int id);
 
-#endif
+#endif /* SERVER_SEND_MSG_H */
diff --git a/src/base/shareFunction.h b/src/base/shareFunction.h
index 43d2ff3..a444842 100644
--- a/src/base/shareFunction.h
+++ b/src/base/shareFunction.h
@@ -1,9 +1,9 @@
-
 #ifndef SHARE_FUNCTION_H
-#    define SHARE_FUNCTION_H
+#define SHARE_FUNCTION_H
 
 extern void share_function_init();
 extern void share_function_add(char *name, void *function);
 extern void *share_function_get(char *name);
 extern void share_function_quit();
-#endif
+
+#endif /* SHARE_FUNCTION_H */
diff --git a/src/base/shot.h b/src/base/shot.h
index 3487e94..97b7a91 100644
--- a/src/base/shot.h
+++ b/src/base/shot.h
@@ -1,17 +1,17 @@
-
 #ifndef SHOT_H
-#    define SHOT_H
-#    ifdef __WIN32__
-#        define random rand
-#    endif
+#define SHOT_H
+
+#include "main.h"
+#include "list.h"
+#include "tux.h"
+#include "arena.h"
+#ifndef PUBLIC_SERVER
+#include "image.h"
+#endif /* PUBLIC_SERVER */
 
-#    include "main.h"
-#    include "list.h"
-#    include "tux.h"
-#    include "arena.h"
-#    ifndef PUBLIC_SERVER
-#        include "image.h"
-#    endif
+#ifdef __WIN32__
+#define random rand
+#endif /* __WIN32__ */
 
 typedef struct shot_struct {
 	int id;
@@ -26,28 +26,28 @@ typedef struct shot_struct {
 	int author_id;
 	bool_t isCanKillAuthor;
 	bool_t del;
-#    ifndef PUBLIC_SERVER
+#ifndef PUBLIC_SERVER
 	image_t *img;
-#    endif
+#endif /* PUBLIC_SERVER */
 } shot_t;
 
 extern bool_t shot_is_inicialized();
 extern void shot_init();
 extern shot_t *shot_new(int x, int y, int px, int py, int gun, int author_id);
-extern shot_t *shot_get_id(list_t * listShot, int id);
-extern void shot_replace_id(shot_t * shot, int id);
+extern shot_t *shot_get_id(list_t *listShot, int id);
+extern void shot_replace_id(shot_t *shot, int id);
 extern void shot_get_status(void *p, int *id, int *x, int *y, int *w, int *h);
 extern void shot_set_status(void *p, int x, int y, int w, int h);
-#    ifndef PUBLIC_SERVER
-extern void shot_draw(shot_t * p);
-extern void shot_draw_list(list_t * listShot);
-#    endif
-extern int shot_is_conflict_with_list_shot(list_t * listShot, int x, int y, int w,
-								  int h);
-extern void shot_event_move_list(arena_t * arena);
-extern void shot_check_is_tux_screen(arena_t * arena);
-extern void shot_bound_bombBall(shot_t * shot);
-extern void shot_transform_lasser(shot_t * shot);
-extern void shot_destroy(shot_t * p);
+#ifndef PUBLIC_SERVER
+extern void shot_draw(shot_t *p);
+extern void shot_draw_list(list_t *listShot);
+#endif /* PUBLIC_SERVER */
+extern int shot_is_conflict_with_list_shot(list_t *listShot, int x, int y, int w, int h);
+extern void shot_event_move_list(arena_t *arena);
+extern void shot_check_is_tux_screen(arena_t *arena);
+extern void shot_bound_bombBall(shot_t *shot);
+extern void shot_transform_lasser(shot_t *shot);
+extern void shot_destroy(shot_t *p);
 extern void shot_quit();
-#endif
+
+#endif /* SHOT_H */
diff --git a/src/base/space.h b/src/base/space.h
index f4169d2..8b888a7 100644
--- a/src/base/space.h
+++ b/src/base/space.h
@@ -1,10 +1,8 @@
-
 #ifndef SPACE_H
+#define SPACE_H
 
-#    define SPACE_H
-
-#    include "main.h"
-#    include "list.h"
+#include "main.h"
+#include "list.h"
 
 typedef struct zone_struct {
 	list_t *list;
@@ -26,29 +24,24 @@ typedef struct space_struct {
 } space_t;
 
 extern space_t *space_new(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 space_get_count(space_t * p);
-extern void *space_get_item(space_t * p, int offset);
-extern void space_add(space_t * p, void *item);
-extern void space_get_object(space_t * p, int x, int y, int w, int h,
-							   list_t * list);
-extern void *space_get_object_id(space_t * p, int id);
-extern int space_is_conflict_with_object(space_t * p, int x, int y, int w,
-										 int h);
-extern int space_is_conflict_with_object_but(space_t * p, int x, int y, int w,
-											int h, void *but);
-extern void space_del(space_t * p, void *item);
-extern void space_del_with_item(space_t * p, void *item, void *f);
-extern void space_move_object(space_t * p, void *item, int move_x, int move_y);
-extern void space_print(space_t * p);
-extern void space_action(space_t * space, void *f, void *p);
-extern void space_action_from_location(space_t * space, void *f, void *p, int x,
-									int y, int w, int h);
-extern void space_destroy(space_t * p);
-extern void space_destroy_with_item(space_t * p, void *f);
-
-#endif
+			  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 space_get_count(space_t *p);
+extern void *space_get_item(space_t *p, int offset);
+extern void space_add(space_t *p, void *item);
+extern void space_get_object(space_t *p, int x, int y, int w, int h, list_t *list);
+extern void *space_get_object_id(space_t *p, int id);
+extern int space_is_conflict_with_object(space_t *p, int x, int y, int w, int h);
+extern int space_is_conflict_with_object_but(space_t *p, int x, int y, int w, int h, void *but);
+extern void space_del(space_t *p, void *item);
+extern void space_del_with_item(space_t *p, void *item, void *f);
+extern void space_move_object(space_t *p, void *item, int move_x, int move_y);
+extern void space_print(space_t *p);
+extern void space_action(space_t *space, void *f, void *p);
+extern void space_action_from_location(space_t *space, void *f, void *p,
+				       int x, int y, int w, int h);
+extern void space_destroy(space_t *p);
+extern void space_destroy_with_item(space_t *p, void *f);
+
+#endif /* SPACE_H */
diff --git a/src/base/storage.h b/src/base/storage.h
index dbd7fc3..1ef9b78 100644
--- a/src/base/storage.h
+++ b/src/base/storage.h
@@ -1,16 +1,14 @@
-
 #ifndef STORAGE_H
-#    define STORAGE_H
+#define STORAGE_H
 
-#    include "main.h"
-#    include "list.h"
+#include "main.h"
+#include "list.h"
 
 extern list_t *storage_new();
-extern void storage_add(list_t * list, char *group, char *name,
-							 void *data);
-extern void *storage_get(list_t * list, char *group, char *name);
-extern void storage_del(list_t * list, char *group, char *name,
-							   void *f);
-extern void storage_del_all(list_t * list, char *group, void *f);
-extern void storage_destroy(list_t * p, void *f);
-#endif
+extern void storage_add(list_t *list, char *group, char *name, void *data);
+extern void *storage_get(list_t *list, char *group, char *name);
+extern void storage_del(list_t *list, char *group, char *name, void *f);
+extern void storage_del_all(list_t *list, char *group, void *f);
+extern void storage_destroy(list_t *p, void *f);
+
+#endif /* STORAGE_H */
diff --git a/src/base/string_length.h b/src/base/string_length.h
index 021bfe8..43a6883 100644
--- a/src/base/string_length.h
+++ b/src/base/string_length.h
@@ -1,17 +1,15 @@
-
 #ifndef STR_LENGTH_H
+#define STR_LENGTH_H
 
-#    define STR_LENGTH_H
-
-#    include "main.h"
+#include "main.h"
 
-#    define STR_SIZE		128
-#    define STR_PROTO_SIZE		128
-#    define STR_LOG_SIZE		256
-#    define STR_NUM_SIZE		8
-#    define STR_NAME_SIZE		32
-#    define STR_PATH_SIZE		4096
-#    define STR_FILE_NAME_SIZE	256
-#    define STR_IP_SIZE		64
+#define STR_SIZE		128
+#define STR_PROTO_SIZE		128
+#define STR_LOG_SIZE		256
+#define STR_NUM_SIZE		8
+#define STR_NAME_SIZE		32
+#define STR_PATH_SIZE		4096
+#define STR_FILE_NAME_SIZE	256
+#define STR_IP_SIZE		64
 
-#endif
+#endif /* STR_LENGTH_H */
diff --git a/src/base/textFile.h b/src/base/textFile.h
index 1ccad7e..d2153fc 100644
--- a/src/base/textFile.h
+++ b/src/base/textFile.h
@@ -1,13 +1,11 @@
-
 #ifndef TEXTFILE_H
+#define TEXTFILE_H
 
-#    define TEXTFILE_H
-
-#    include "list.h"
+#include "list.h"
 
-#    ifdef __WIN32__
-#        define lstat stat
-#    endif
+#ifdef __WIN32__
+#define lstat stat
+#endif /* __WIN32__ */
 
 typedef struct str_textFile_t {
 	char *file;
@@ -16,9 +14,8 @@ typedef struct str_textFile_t {
 
 extern textFile_t *text_file_new(char *s);
 extern textFile_t *text_file_load(char *s);
-extern void text_file_print(textFile_t * p);
-extern void text_file_save(textFile_t * p);
-extern void text_file_destroy(textFile_t * p);
-
+extern void text_file_print(textFile_t *p);
+extern void text_file_save(textFile_t *p);
+extern void text_file_destroy(textFile_t *p);
 
-#endif
+#endif /* TEXTFILE_H */
diff --git a/src/base/tux.h b/src/base/tux.h
index d2d9ea4..9258a78 100644
--- a/src/base/tux.h
+++ b/src/base/tux.h
@@ -1,83 +1,81 @@
-
 #ifndef TUX_H
+#define TUX_H
 
-#    define TUX_H
-
-#    include "main.h"
-#    include "list.h"
-#    include "arena.h"
+#include "main.h"
+#include "list.h"
+#include "arena.h"
 
-#    define TUX_STEP 7
-#    define TUX_LAYER 0
+#define TUX_STEP		7
+#define TUX_LAYER		0
 
-#    define TUX_MAX_ANIMATION_FRAME 10
-#    define TUX_KEY 1
+#define TUX_MAX_ANIMATION_FRAME	10
+#define TUX_KEY			1
 
-#    define TUX_LOCATE_UNKNOWN -100
+#define TUX_LOCATE_UNKNOWN	-100
 
-#    define TUX_MAX_PICKUP	50
-#    define TUX_MAX_BONUS	500
+#define TUX_MAX_PICKUP		50
+#define TUX_MAX_BONUS		500
 
-#    define TUX_TIME_SPAWN		2000
-#    define TUX_TIME_CAN_SHOT	500
-#    define TUX_TIME_CAN_SWITCH_GUN	100
+#define TUX_TIME_SPAWN		2000
+#define TUX_TIME_CAN_SHOT	500
+#define TUX_TIME_CAN_SWITCH_GUN	100
 
-#    define TUX_STATUS_ALIVE	0
-#    define TUX_STATUS_DEAD		1
-#    define TUX_STATUS_PAUZED	2
+#define TUX_STATUS_ALIVE	0
+#define TUX_STATUS_DEAD		1
+#define TUX_STATUS_PAUZED	2
 
-#    define TUX_CONTROL_NONE		0
-#    define TUX_CONTROL_KEYBOARD_LEFT	1
-#    define TUX_CONTROL_KEYBOARD_RIGHT	2
-#    define TUX_CONTROL_NET			3
-#    define TUX_CONTROL_AI			4
+#define TUX_CONTROL_NONE		0
+#define TUX_CONTROL_KEYBOARD_LEFT	1
+#define TUX_CONTROL_KEYBOARD_RIGHT	2
+#define TUX_CONTROL_NET			3
+#define TUX_CONTROL_AI			4
 
-#    define TUX_WIDTH	30
-#    define TUX_HEIGHT	30
+#define TUX_WIDTH		30
+#define TUX_HEIGHT		30
 
-#    define TUX_IMG_WIDTH	40
-#    define TUX_IMG_HEIGHT	54
+#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 POSITION_UNKNOWN	-1
+#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
+#define TUX_SHOT		5
+#define TUX_SWITCH_GUN		0
 
 
-#    define GUN_NONE	-1
+#define GUN_NONE		-1
 
-#    define GUN_COUNT	7
-#    define GUN_MAX_SHOT	5
+#define GUN_COUNT		7
+#define GUN_MAX_SHOT		5
 
-#    define BONUS_COUNT	6
-#    define ITEM_COUNT	16
+#define BONUS_COUNT		6
+#define ITEM_COUNT		16
 
 
-#    define SHOT_CHECK_AREA	25
+#define SHOT_CHECK_AREA		25
 
-#    define GUN_SIMPLE		0
-#    define GUN_DUAL_SIMPLE		1
-#    define GUN_SCATTER		2
-#    define GUN_TOMMY		3
-#    define GUN_LASSER		4
-#    define GUN_MINE		5
-#    define GUN_BOMBBALL		6
+#define GUN_SIMPLE		0
+#define GUN_DUAL_SIMPLE		1
+#define GUN_SCATTER		2
+#define GUN_TOMMY		3
+#define GUN_LASSER		4
+#define GUN_MINE		5
+#define GUN_BOMBBALL		6
 
-#    define ITEM_MINE		7
-#    define ITEM_EXPLOSION		8
-#    define ITEM_BIG_EXPLOSION	9
+#define ITEM_MINE		7
+#define ITEM_EXPLOSION		8
+#define ITEM_BIG_EXPLOSION	9
 
-#    define BONUS_NONE	-1
-#    define BONUS_SPEED	10
-#    define BONUS_SHOT	11
-#    define BONUS_TELEPORT	12
-#    define BONUS_GHOST	13
-#    define BONUS_4X	14
-#    define BONUS_HIDDEN	15
+#define BONUS_NONE		-1
+#define BONUS_SPEED		10
+#define BONUS_SHOT		11
+#define BONUS_TELEPORT		12
+#define BONUS_GHOST		13
+#define BONUS_4X		14
+#define BONUS_HIDDEN		15
 
 typedef struct tux_struct {
 	int id;
@@ -111,27 +109,27 @@ typedef struct tux_struct {
 extern bool_t tux_is_inicialized();
 extern void tux_init();
 extern tux_t *tux_new();
-extern void tux_set_name(tux_t * tux, char *name);
-extern bool_t tux_is_any_gun(tux_t * tux);
+extern void tux_set_name(tux_t *tux, char *name);
+extern bool_t tux_is_any_gun(tux_t *tux);
 extern void tux_get_course(int n, int *x, int *y);
-extern void tux_draw(tux_t * tux);
-//extern void drawListTux(list_t *listTux);
-extern void tux_event_tux_is_dead(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 tux_conflict_woth_shot(arena_t * arena);
-//extern void eventConflictTuxWithTeleport(list_t *listTux, list_t *listTeleport);
-extern void tux_teleport(tux_t * tux);
-extern void tux_action(tux_t * tux, int action);
-extern void tux_event(tux_t * tux);
-//extern void eventListTux(list_t *listTux);
-//extern tux_t* getTuxID(list_t *listTux, int id);
-extern void tux_get_proportion(tux_t * tux, int *x, int *y, int *w, int *h);
-extern void tux_replace_id(tux_t * tux, int id);
-extern void tux_set_proportion(tux_t * tux, int x, int y);
+extern void tux_draw(tux_t *tux);
+/*extern void drawListTux(list_t *listTux);*/
+extern void tux_event_tux_is_dead(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 tux_conflict_woth_shot(arena_t *arena);
+/*extern void eventConflictTuxWithTeleport(list_t *listTux, list_t *listTeleport);*/
+extern void tux_teleport(tux_t *tux);
+extern void tux_action(tux_t *tux, int action);
+extern void tux_event(tux_t *tux);
+/*extern void eventListTux(list_t *listTux);*/
+/*extern tux_t *getTuxID(list_t *listTux, int id);*/
+extern void tux_get_proportion(tux_t *tux, int *x, int *y, int *w, int *h);
+extern void tux_replace_id(tux_t *tux, int id);
+extern void tux_set_proportion(tux_t *tux, int x, int y);
 extern void tux_get_status(void *p, int *id, int *x, int *y, int *w, int *h);
 extern void tux_set_status(void *p, int x, int y, int w, int h);
-extern void tux_destroy(tux_t * tux);
+extern void tux_destroy(tux_t *tux);
 extern void tux_quit();
 
-#endif
+#endif /* TUX_H */
diff --git a/src/base/udp_server.h b/src/base/udp_server.h
index 9565aee..3d7b292 100644
--- a/src/base/udp_server.h
+++ b/src/base/udp_server.h
@@ -1,16 +1,14 @@
-
 #ifndef SERVER_UDP_H
+#define SERVER_UDP_H
 
-#    define SERVER_UDP_H
-
-#    include "server.h"
-#    include "udp.h"
+#include "server.h"
+#include "udp.h"
 
-extern client_t *server_udp_new_client(sock_udp_t * sock_udp);
-extern void server_udp_destroy_client(client_t * p);
+extern client_t *server_udp_new_client(sock_udp_t *sock_udp);
+extern void server_udp_destroy_client(client_t *p);
 extern int server_udp_init(char *ip4, int port4, char *ip6, int port6);
 extern void server_udp_set_select();
 extern int server_udp_select_sock();
 extern void server_udp_quit();
 
-#endif
+#endif /* SERVER_UDP_H */