about summary refs log tree commit diff
path: root/src/game/g_game.cpp
diff options
context:
space:
mode:
authorMagnus Auvinen <magnus.auvinen@gmail.com>2008-01-13 11:15:32 +0000
committerMagnus Auvinen <magnus.auvinen@gmail.com>2008-01-13 11:15:32 +0000
commitea245b969d1864441b41d25c7631beccfb39d874 (patch)
tree68fb62ef99cdd90f5dd4ec8edf11e7bb54b7f953 /src/game/g_game.cpp
parent906ece7894927983b8ac69e37dd3cb82cfe7aad1 (diff)
downloadzcatch-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.cpp')
-rw-r--r--src/game/g_game.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/game/g_game.cpp b/src/game/g_game.cpp
index 4befc33e..ba70c31c 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_check_point((int)(pos.x+phys_size/2), (int)(pos.y+phys_size/2+5)))
+	if(col_is_solid((int)(pos.x+phys_size/2), (int)(pos.y+phys_size/2+5)))
 		grounded = true;
-	if(col_check_point((int)(pos.x-phys_size/2), (int)(pos.y+phys_size/2+5)))
+	if(col_is_solid((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));