summaryrefslogtreecommitdiff
path: root/src/base/arena.h
diff options
context:
space:
mode:
authorxHire <xhire@tuxportal.cz>2008-10-25 14:11:06 +0200
committerxHire <xhire@tuxportal.cz>2008-10-25 14:11:06 +0200
commitc8a9209d77a896bf49227e5aeccd54e91ccf29cc (patch)
tree6b7367406ebbc6ce3ea5e0c8668c75f6fb3f6ae9 /src/base/arena.h
parentcb9deba915dd7b114eeb76601eb1c8b07c1ba90f (diff)
Changed style of the code to the K&R standard
Diffstat (limited to 'src/base/arena.h')
-rw-r--r--src/base/arena.h57
1 files changed, 28 insertions, 29 deletions
diff --git a/src/base/arena.h b/src/base/arena.h
index 3ff21d3..14f0f1f 100644
--- a/src/base/arena.h
+++ b/src/base/arena.h
@@ -1,41 +1,40 @@
#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
-#ifdef __WIN32__
-#define random rand
-#endif
+# ifdef __WIN32__
+# define random rand
+# endif
-#define SCREEN_SPLIT_HORIZONTAL 1
-#define SCREEN_SPLIT_VERTICAL 2
+# define SCREEN_SPLIT_HORIZONTAL 1
+# define SCREEN_SPLIT_VERTICAL 2
-#include "list.h"
-#include "space.h"
+# include "list.h"
+# include "space.h"
-typedef struct arena_struct
-{
-#ifndef PUBLIC_SERVER
- char music[STR_SIZE];
+typedef struct arena_struct {
+# ifndef PUBLIC_SERVER
+ char music[STR_SIZE];
- image_t *background;
-#endif
- int w, h;
+ image_t *background;
+# endif
+ int w, h;
- list_t *listTimer;
+ list_t *listTimer;
- space_t *spaceShot;
- space_t *spaceTux;
- space_t *spaceItem;
+ space_t *spaceShot;
+ space_t *spaceTux;
+ space_t *spaceItem;
- int countRound;
- int max_countRound;
+ int countRound;
+ int max_countRound;
} arena_t;
@@ -45,14 +44,14 @@ extern void initArena();
extern void quitArena();
extern arena_t *newArena(int w, int h);
extern int conflictSpace(int x1, int y1, int w1, int h1, int x2, int y2,
- int w2, int h2);
+ int w2, int h2);
extern int isFreeSpace(arena_t * arena, int x, int y, int w, int h);
extern void findFreeSpace(arena_t * arena, int *x, int *y, int w, int h);
extern void getCenterScreen(int *screen_x, int *screen_y, int x, int y,
- int screen_size_x, int screen_size_y);
-#ifndef PUBLIC_SERVER
+ int screen_size_x, int screen_size_y);
+# ifndef PUBLIC_SERVER
extern void drawArena(arena_t * arena);
-#endif
+# endif
extern void eventArena(arena_t * arena);
extern void destroyArena(arena_t * p);