diff options
| author | Magnus Auvinen <magnus.auvinen@gmail.com> | 2008-01-13 11:15:32 +0000 |
|---|---|---|
| committer | Magnus Auvinen <magnus.auvinen@gmail.com> | 2008-01-13 11:15:32 +0000 |
| commit | ea245b969d1864441b41d25c7631beccfb39d874 (patch) | |
| tree | 68fb62ef99cdd90f5dd4ec8edf11e7bb54b7f953 /src/game/g_game.h | |
| parent | 906ece7894927983b8ac69e37dd3cb82cfe7aad1 (diff) | |
| download | zcatch-ea245b969d1864441b41d25c7631beccfb39d874.tar.gz zcatch-ea245b969d1864441b41d25c7631beccfb39d874.zip | |
new mapformat in place. continued the cleanup. some effects are gone, gonna be redone so no biggie. CTF isn't working now.
Diffstat (limited to 'src/game/g_game.h')
| -rw-r--r-- | src/game/g_game.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/game/g_game.h b/src/game/g_game.h index 0e405260..395362a9 100644 --- a/src/game/g_game.h +++ b/src/game/g_game.h @@ -6,7 +6,7 @@ #include <game/g_math.h> #include <math.h> #include "../engine/e_interface.h" -#include "g_mapres_col.h" +#include "g_collision.h" #include "g_protocol.h" @@ -126,7 +126,7 @@ public: #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(float x, float y) { return col_is_solid((int)x, (int)y) != 0; } inline bool col_check_point(vec2 p) { return col_check_point(p.x, p.y); } struct mapres_entity |