diff options
| author | Magnus Auvinen <magnus.auvinen@gmail.com> | 2008-01-19 10:57:25 +0000 |
|---|---|---|
| committer | Magnus Auvinen <magnus.auvinen@gmail.com> | 2008-01-19 10:57:25 +0000 |
| commit | dd21ae1bc7a648138d33727628983a3b25a07570 (patch) | |
| tree | caf87523cda90c3a0fb235ea6e642765136d3f88 /src/game/g_game.cpp | |
| parent | 4eb71856948077b4c0cf9b5ef7178075433b7259 (diff) | |
| download | zcatch-dd21ae1bc7a648138d33727628983a3b25a07570.tar.gz zcatch-dd21ae1bc7a648138d33727628983a3b25a07570.zip | |
large commit. documented a bit. editor updates. general cleanup of everything
Diffstat (limited to 'src/game/g_game.cpp')
| -rw-r--r-- | src/game/g_game.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/game/g_game.cpp b/src/game/g_game.cpp index ba70c31c..4befc33e 100644 --- a/src/game/g_game.cpp +++ b/src/game/g_game.cpp @@ -118,9 +118,9 @@ void player_core::tick() triggered_events = 0; bool grounded = false; - if(col_is_solid((int)(pos.x+phys_size/2), (int)(pos.y+phys_size/2+5))) + if(col_check_point((int)(pos.x+phys_size/2), (int)(pos.y+phys_size/2+5))) grounded = true; - if(col_is_solid((int)(pos.x-phys_size/2), (int)(pos.y+phys_size/2+5))) + if(col_check_point((int)(pos.x-phys_size/2), (int)(pos.y+phys_size/2+5))) grounded = true; vec2 direction = normalize(vec2(input.target_x, input.target_y)); |