diff options
| author | Magnus Auvinen <magnus.auvinen@gmail.com> | 2007-08-30 07:15:26 +0000 |
|---|---|---|
| committer | Magnus Auvinen <magnus.auvinen@gmail.com> | 2007-08-30 07:15:26 +0000 |
| commit | c919da6640a34d49cc128c8eed1ba383463bbc6f (patch) | |
| tree | e329cbc1095f92056f7d2e449442555dddb9e4cc /src/game/game.h | |
| parent | 0e7054a24abfe2074aa5bbc556205cf2381bb87a (diff) | |
| download | zcatch-c919da6640a34d49cc128c8eed1ba383463bbc6f.tar.gz zcatch-c919da6640a34d49cc128c8eed1ba383463bbc6f.zip | |
made stuff for ctf. all editor stuff for it is done. the ctf logic has to be written.
Diffstat (limited to 'src/game/game.h')
| -rw-r--r-- | src/game/game.h | 22 |
1 files changed, 17 insertions, 5 deletions
diff --git a/src/game/game.h b/src/game/game.h index 3a1af48f..e3e4e99e 100644 --- a/src/game/game.h +++ b/src/game/game.h @@ -27,10 +27,15 @@ inline float get_angle(vec2 dir) inline bool col_check_point(float x, float y) { return col_check_point((int)x, (int)y) != 0; } inline bool col_check_point(vec2 p) { return col_check_point(p.x, p.y); } +struct mapres_entity +{ + int x, y; + int data[]; +}; + struct mapres_spawnpoint { int x, y; - int type; }; struct mapres_item @@ -39,14 +44,21 @@ struct mapres_item int type; }; +struct mapres_flagstand +{ + int x, y; +}; + enum { + MAPRES_ENTS_START=1, MAPRES_SPAWNPOINT=1, MAPRES_ITEM=2, - MAPRES_SPAWNPOINT_RED=2, - MAPRES_SPAWNPOINT_BLUE=3, - MAPRES_FLAGSTAND_RED=4, - MAPRES_FLAGSTAND_BLUE=5, + MAPRES_SPAWNPOINT_RED=3, + MAPRES_SPAWNPOINT_BLUE=4, + MAPRES_FLAGSTAND_RED=5, + MAPRES_FLAGSTAND_BLUE=6, + MAPRES_ENTS_END, ITEM_NULL=0, ITEM_WEAPON_GUN=0x00010001, |