summaryrefslogtreecommitdiff
path: root/include/arena.h
diff options
context:
space:
mode:
Diffstat (limited to 'include/arena.h')
-rw-r--r--include/arena.h10
1 files changed, 7 insertions, 3 deletions
diff --git a/include/arena.h b/include/arena.h
index c800169..2c06659 100644
--- a/include/arena.h
+++ b/include/arena.h
@@ -4,10 +4,13 @@
#define ARENA_H
#include "main.h"
+
#ifndef PUBLIC_SERVER
#include "interface.h"
#endif
+
#include "list.h"
+#include "space.h"
typedef struct arena_struct
{
@@ -18,14 +21,15 @@ typedef struct arena_struct
#endif
int w, h;
list_t *listTimer;
- list_t *listTux;
+ //list_t *listTux;
list_t *listShot;
- list_t *listItem;
+ space_t *spaceTux;
+ space_t *spaceItem;
} arena_t;
extern void setCurrentArena(arena_t *p);
extern arena_t* getCurrentArena();
-extern arena_t* newArena();
+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);
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);