1 files changed, 54 insertions, 47 deletions

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