Rectified the coding style in screen .h files

11 files changed, 80 insertions, 99 deletions

diff --git a/src/screen/analyze.h b/src/screen/analyze.h
index 683f26e..2fc2b7b 100644
--- a/src/screen/analyze.h
+++ b/src/screen/analyze.h
@@ -1,9 +1,7 @@
-
 #ifndef SCREEN_ANALYZE_H
+#define SCREEN_ANALYZE_H
 
-#    define SCREEN_ANALYZE_H
-
-#    include "main.h"
+#include "main.h"
 
 typedef struct analyze_struct {
 	char *name;
@@ -21,4 +19,4 @@ extern void analyze_end();
 extern void analyze_init();
 extern void analyze_quit();
 
-#endif
+#endif /* SCREEN_ANALYZE_H */
diff --git a/src/screen/browser.h b/src/screen/browser.h
index eb22a05..76c0e42 100644
--- a/src/screen/browser.h
+++ b/src/screen/browser.h
@@ -1,7 +1,5 @@
-
 #ifndef SCREEN_BROWSER_H
-
-#    define SCREEN_BROWSER_H
+#define SCREEN_BROWSER_H
 
 typedef struct server_context {
 	struct server_context *next, *prev;
@@ -22,7 +20,6 @@ typedef struct server_context {
 	char *arena;
 } server_t;
 
-
 extern void browser_start();
 extern void browser_draw();
 extern void browser_event();
@@ -30,4 +27,4 @@ extern void browser_stop();
 extern void browser_init();
 extern void browser_quit();
 
-#endif
+#endif /* SCREEN_BROWSER_H */
diff --git a/src/screen/choiceArena.h b/src/screen/choiceArena.h
index b0e1ce4..c0adacd 100644
--- a/src/screen/choiceArena.h
+++ b/src/screen/choiceArena.h
@@ -1,19 +1,17 @@
+#ifndef SCREEN_CHOICE_ARENA_H
+#define SCREEN_CHOICE_ARENA_H
 
-#ifndef SCREEN_CHOICE_ARENA
+#include "main.h"
+#include "arenaFile.h"
 
-#    define SCREEN_CHOICE_ARENA
-
-#    include "main.h"
-#    include "arenaFile.h"
-
-#    define SCREENSHOT_ARENA_WIDTH		160
-#    define SCREENSHOT_ARENA_HEIGHT		107
+#define SCREENSHOT_ARENA_WIDTH		160
+#define SCREENSHOT_ARENA_HEIGHT		107
 
 extern void choice_arena_draw();
 extern void choice_arena_event();
 extern arenaFile_t *choice_arena_get();
-extern void choice_arena_set(arenaFile_t * arenaFile);
+extern void choice_arena_set(arenaFile_t *arenaFile);
 extern void choice_arena_init();
 extern void choice_arena_quit();
 
-#endif
+#endif /* SCREEN_CHOICE_ARENA_H */
diff --git a/src/screen/credits.h b/src/screen/credits.h
index 0b05312..827b9c1 100644
--- a/src/screen/credits.h
+++ b/src/screen/credits.h
@@ -1,14 +1,12 @@
-
 #ifndef SCREEN_CREDITS_H
+#define SCREEN_CREDITS_H
 
-#    define SCREEN_CREDITS_H
-
-#    define SCREEN_CREDITS_FILE		"AUTHORS"
+#define SCREEN_CREDITS_FILE		"AUTHORS"
 
-#    define SCREEN_CREDITS_OFFSET_MIN	130
-#    define SCREEN_CREDITS_OFFSET_MAX	WINDOW_SIZE_Y-120
-#    define SCREEN_CREDITS_OFFSET_RESTART	-1000
-#    define SCREEN_CREDITS_OFFSET_SPEED	2
+#define SCREEN_CREDITS_OFFSET_MIN	130
+#define SCREEN_CREDITS_OFFSET_MAX	WINDOW_SIZE_Y-120
+#define SCREEN_CREDITS_OFFSET_RESTART	-1000
+#define SCREEN_CREDITS_OFFSET_SPEED	2
 
 extern void scredits_start();
 extern void scredits_draw();
@@ -17,4 +15,4 @@ extern void scredits_stop();
 extern void scredits_init();
 extern void scredits_quit();
 
-#endif
+#endif /* SCREEN_CREDITS_H */
diff --git a/src/screen/downArena.h b/src/screen/downArena.h
index c71a556..444210c 100644
--- a/src/screen/downArena.h
+++ b/src/screen/downArena.h
@@ -1,16 +1,14 @@
-
 #ifndef SCREEN_DOWN_ARENA_H
+#define SCREEN_DOWN_ARENA_H
 
-#    define SCREEN_DOWN_ARENA_H
-
-#    define DOWN_SERVER_STATUS_OK		0
-#    define DOWN_SERVER_STATUS_ZOMBIE	1
+#define DOWN_SERVER_STATUS_OK		0
+#define DOWN_SERVER_STATUS_ZOMBIE	1
 
-#    define	DOWN_ARENA_BUFFER_SIZE	4096
+#define	DOWN_ARENA_BUFFER_SIZE		4096
 
-#    define DOWN_ARENA_MAX_SEND_MSG_STATUS	10
-#    define DOWN_ARENA_MAX_TIEMOUT_LIMIT	500
-#    define DOWN_ARENA_COUNT_READ_SOCKET	100
+#define DOWN_ARENA_MAX_SEND_MSG_STATUS	10
+#define DOWN_ARENA_MAX_TIEMOUT_LIMIT	500
+#define DOWN_ARENA_COUNT_READ_SOCKET	100
 
 extern void down_arena_start();
 extern void down_arena_draw();
@@ -19,4 +17,4 @@ extern void down_arena_stop();
 extern void down_arena_init();
 extern void down_arena_quit();
 
-#endif
+#endif /* SCREEN_DOWN_ARENA_H */
diff --git a/src/screen/gameType.h b/src/screen/gameType.h
index 9e88c60..49cf008 100644
--- a/src/screen/gameType.h
+++ b/src/screen/gameType.h
@@ -1,9 +1,7 @@
+#ifndef SCREEN_GAME_TYPE_H
+#define SCREEN_GAME_TYPE_H
 
-#ifndef SCREEN_GAME_TYPE
-
-#    define SCREEN_GAME_TYPE
-
-#    include "main.h"
+#include "main.h"
 
 extern void game_type_draw();
 extern void game_type_event();
@@ -18,4 +16,4 @@ extern int public_server_get_settingPort();
 extern int public_server_get_settingProto();
 extern void game_type_quit();
 
-#endif
+#endif /* SCREEN_GAME_TYPE_H */
diff --git a/src/screen/mainMenu.h b/src/screen/mainMenu.h
index ec25150..99249b4 100644
--- a/src/screen/mainMenu.h
+++ b/src/screen/mainMenu.h
@@ -1,9 +1,7 @@
+#ifndef SCREEN_MAIN_MENU_H
+#define SCREEN_MAIN_MENU_H
 
-#ifndef SCREEN_MIAN_MENU_H
-
-#    define SCREEN_MIAN_MENU_H
-
-#    include "main.h"
+#include "main.h"
 
 extern void main_menu_start();
 extern void main_menu_draw();
@@ -12,4 +10,4 @@ extern void main_menu_stop();
 extern void main_menu_init();
 extern void main_menu_quit();
 
-#endif
+#endif /* SCREEN_MAIN_MENU_H */
diff --git a/src/screen/setting.h b/src/screen/setting.h
index e98aa01..c29e6a9 100644
--- a/src/screen/setting.h
+++ b/src/screen/setting.h
@@ -1,13 +1,11 @@
+#ifndef SCREEN_SETTING_H
+#define SCREEN_SETTING_H
 
-#ifndef SCREEN_SETTING
+#include "main.h"
 
-#    define SCREEN_SETTING
-
-#    include "main.h"
-
-#    define NAME_AI			"TuxBot"
-#    define NAME_PLAYER_RIGHT	"Name1"
-#    define NAME_PLAYER_LEFT	"Name2"
+#define NAME_AI			"TuxBot"
+#define NAME_PLAYER_RIGHT	"Name1"
+#define NAME_PLAYER_LEFT	"Name2"
 
 extern void setting_init();
 extern void setting_draw();
@@ -19,4 +17,5 @@ extern bool_t setting_is_ai();
 extern bool_t setting_is_any_item();
 extern bool_t setting_is_item(int item);
 extern void setting_quit();
-#endif
+
+#endif /* SCREEN_SETTING_H */
diff --git a/src/screen/settingKeys.h b/src/screen/settingKeys.h
index 13e57fd..c7d6c66 100644
--- a/src/screen/settingKeys.h
+++ b/src/screen/settingKeys.h
@@ -1,21 +1,22 @@
+#ifndef SCREEN_SETTING_KEYS_H
+#define SCREEN_SETTING_KEYS_H
+
+#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"
 
-#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
-	
-#    include "main.h"
 extern void setting_key_int();
 extern void setting_key_draw();
 extern void setting_key_event();
@@ -24,4 +25,4 @@ extern void key_table_init();
 extern int key_table_get_key(int n);
 extern void key_table_quit();
 
-#endif							/*  */
+#endif /* SCREEN_SETTING_KEYS_H */
diff --git a/src/screen/table.h b/src/screen/table.h
index 9f4bf46..7940ee9 100644
--- a/src/screen/table.h
+++ b/src/screen/table.h
@@ -1,10 +1,8 @@
-
 #ifndef SCREEN_TABLE_H
+#define SCREEN_TABLE_H
 
-#    define SCREEN_TABLE_H
-
-#    define SCREEN_TABLE_MAX_PLAYERS	10
-#    define SCREEN_TABLE_FILE_HIGHSCORE_NAME	"highscore"
+#define SCREEN_TABLE_MAX_PLAYERS		10
+#define SCREEN_TABLE_FILE_HIGHSCORE_NAME	"highscore"
 
 extern void table_start();
 extern void table_draw();
@@ -14,4 +12,4 @@ extern int table_add(char *name, int score);
 extern void table_init();
 extern void table_quit();
 
-#endif
+#endif /* SCREEN_TABLE_H */
diff --git a/src/screen/world.h b/src/screen/world.h
index 1030dca..35eb74d 100644
--- a/src/screen/world.h
+++ b/src/screen/world.h
@@ -1,30 +1,28 @@
-
 #ifndef SCREEN_WORLD_H
+#define SCREEN_WORLD_H
 
-#    define SCREEN_WORLD_H
-
-#    include "main.h"
-#    include "myTimer.h"
-#    include "tux.h"
-#    include "arenaFile.h"
-#    include "arena.h"
+#include "main.h"
+#include "myTimer.h"
+#include "tux.h"
+#include "arenaFile.h"
+#include "arena.h"
 
-#    define TIMER_END_ARENA 5000
-#    define WORLD_COUNT_ROUND_UNLIMITED	-1
-#    define LAG_SERVER_UNKNOWN		-1
+#define TIMER_END_ARENA			5000
+#define WORLD_COUNT_ROUND_UNLIMITED	-1
+#define LAG_SERVER_UNKNOWN		-1
 
 extern bool_t world_is_inicialized();
 extern void world_init();
-extern void world_set_arena(arenaFile_t * arenaFile);
+extern void world_set_arena(arenaFile_t *arenaFile);
 extern void world_do_end();
 extern void world_inc_round();
 extern tux_t *world_get_control_tux(int control_type);
-extern void world_set_control_tux(tux_t * tux, int control_type);
-extern void world_tux_control(tux_t * p);
+extern void world_set_control_tux(tux_t *tux, int control_type);
+extern void world_tux_control(tux_t *p);
 extern void world_draw();
 extern void world_event();
 extern void world_start();
 extern void world_stop();
 extern void world_quit();
 
-#endif
+#endif /* SCREEN_WORLD_H */