diff options
| author | oroborus <oroborus@0ee4d065-81f0-4d1e-b06c-ff20ad07cc3e> | 2008-03-25 21:23:08 +0000 |
|---|---|---|
| committer | oroborus <oroborus@0ee4d065-81f0-4d1e-b06c-ff20ad07cc3e> | 2008-03-25 21:23:08 +0000 |
| commit | ca324c005d511752b2bcdc21fdc7d6c46597469b (patch) | |
| tree | 050b5b836f26390ef44f67a2208fe47c161e8b62 /include | |
| parent | 6d43cfd6df88e1b6e94c63f9e8e9eb6775bdbf42 (diff) | |
- drobne upravy v kode
- vymazanie duplivitneho kodu pri "hre s GUI" a "public serverom"
git-svn-id: http://opensvn.csie.org/tuxanci_ng@36 0ee4d065-81f0-4d1e-b06c-ff20ad07cc3e
Diffstat (limited to 'include')
| -rw-r--r-- | include/arena.h | 9 | ||||
| -rw-r--r-- | include/publicServer.h | 4 | ||||
| -rw-r--r-- | include/screen_world.h | 4 |
3 files changed, 9 insertions, 8 deletions
diff --git a/include/arena.h b/include/arena.h index 4dc5b83..551c2c2 100644 --- a/include/arena.h +++ b/include/arena.h @@ -25,7 +25,16 @@ typedef struct arena_struct list_t *listPipe; } arena_t; +extern void setCurrentArena(arena_t *p); +extern arena_t* getCurrentArena(); extern arena_t* newArena(); +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); +#ifndef PUBLIC_SERVER +extern void drawArena(arena_t *arena); +#endif +extern void eventArena(arena_t *arena); extern void destroyArena(arena_t *p); #endif diff --git a/include/publicServer.h b/include/publicServer.h index 7577932..6d0c8b4 100644 --- a/include/publicServer.h +++ b/include/publicServer.h @@ -7,13 +7,9 @@ #define WORLD_COUNT_ROUND_UNLIMITED -1 -extern arena_t* getWorldArena(); extern void countRoundInc(); extern int initPublicServer(); extern int getChoiceArenaId(); -extern int conflictSpace(int x1,int y1,int w1,int h1,int x2,int y2,int w2,int h2); -extern int isFreeSpace(int x, int y, int w, int h); -extern void findFreeSpace(int *x, int *y, int w, int h); extern void eventPublicServer(); extern void my_handler_quit(int n); extern void quitPublicServer(); diff --git a/include/screen_world.h b/include/screen_world.h index 7ad6a41..c9a46e6 100644 --- a/include/screen_world.h +++ b/include/screen_world.h @@ -12,14 +12,10 @@ extern bool_t isScreenWorldInicialized(); extern void initWorld(); -extern arena_t* getWorldArena(); extern void setWorldArena(int id); extern void countRoundInc(); extern void setWorldEnd(); extern void setMaxCountRound(int n); -extern int conflictSpace(int x1,int y1,int w1,int h1,int x2,int y2,int w2,int h2); -extern int isFreeSpace(int x, int y, int w, int h); -extern void findFreeSpace(int *x, int *y, int w, int h); extern void tuxControl(tux_t *p); extern void drawWorld(); extern void eventWorld(); |