From dd21ae1bc7a648138d33727628983a3b25a07570 Mon Sep 17 00:00:00 2001 From: Magnus Auvinen Date: Sat, 19 Jan 2008 10:57:25 +0000 Subject: large commit. documented a bit. editor updates. general cleanup of everything --- src/game/g_game.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/game/g_game.cpp') 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)); -- cgit 1.4.1