1 files changed, 28 insertions, 28 deletions

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 */