diff options
| author | Olle Rosenquist <phobos99@gmail.com> | 2007-07-21 19:03:50 +0000 |
|---|---|---|
| committer | Olle Rosenquist <phobos99@gmail.com> | 2007-07-21 19:03:50 +0000 |
| commit | 4ef0a10bf9990816f60cfe0f0d4d5131ba08b5cd (patch) | |
| tree | 8bfad3e79a9ef24ba7194fabc8078ff8b0b89384 /src/game/game.h | |
| parent | 0c786f6002380ea8fe8ecc459962d91844965a24 (diff) | |
| download | zcatch-4ef0a10bf9990816f60cfe0f0d4d5131ba08b5cd.tar.gz zcatch-4ef0a10bf9990816f60cfe0f0d4d5131ba08b5cd.zip | |
Updated stuff
Diffstat (limited to 'src/game/game.h')
| -rw-r--r-- | src/game/game.h | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/src/game/game.h b/src/game/game.h index 5f69ef9e..64dcc685 100644 --- a/src/game/game.h +++ b/src/game/game.h @@ -18,6 +18,10 @@ inline float get_angle(baselib::vec2 dir) return a; } +#define LERP(a,b,t) (a + (b-a) * t) +#define min(a, b) ( a > b ? b : a) +#define max(a, b) ( a > b ? a : b) + inline bool col_check_point(float x, float y) { return col_check_point((int)x, (int)y) != 0; } inline bool col_check_point(baselib::vec2 p) { return col_check_point(p.x, p.y); } @@ -34,6 +38,7 @@ enum EVENT_DAMAGEINDICATION, EVENT_SOUND, EVENT_SMOKE, + EVENT_SPAWN, }; enum @@ -75,6 +80,11 @@ struct ev_explosion int x, y; }; +struct ev_spawn +{ + int x, y; +}; + struct ev_sound { int x, y; @@ -152,9 +162,6 @@ enum POWERUP_TYPE_TIMEFIELD = 4, POWERUP_TYPE_NUMPOWERUPS, - PLAYER_MAXHEALTH = 10, - PLAYER_MAXARMOR = 10, - MODIFIER_TYPE_NINJA = 0, MODIFIER_TYPE_TIMEFIELD = 1, MODIFIER_NUMMODIFIERS, |