(#199) player_rect_object_collide -> player_touches_rect_sides

diff --git a/src/game/level/player.c b/src/game/level/player.c
index 5086ae86d7d8fc6449e2f2728b4bf31714ee0ade..5645cd92ef7e5bfa6de05ec92180bdab5246b6c1 100644 (file)
--- a/src/game/level/player.c
+++ b/src/game/level/player.c
@@ -282,9 +282,9 @@ int player_sound(player_t *player,
     return 0;
 }
 
-void player_rect_object_collide(player_t *player,
-                                rect_t object,
-                                int sides[RECT_SIDE_N])
+void player_touches_rect_sides(player_t *player,
+                               rect_t object,
+                               int sides[RECT_SIDE_N])
 {
     if (player->state == PLAYER_STATE_ALIVE) {
         rigid_rect_touches_rect_sides(player->alive_body, object, sides);

diff --git a/src/game/level/player.h b/src/game/level/player.h
index 2b14b97dc24d546e779d6083396735ac4d6a6dd2..822c91045cb303fb43e7ba59fce9217160a029f2 100644 (file)
--- a/src/game/level/player.h
+++ b/src/game/level/player.h
@@ -26,9 +26,9 @@ void player_update(player_t * player,
 void player_collide_with_solid(player_t *player, solid_ref_t solid);
 void player_impact_rigid_rect(player_t * player,
                               rigid_rect_t *rigid_rect);
-void player_rect_object_collide(player_t *player,
-                                rect_t object,
-                                int sides[RECT_SIDE_N]);
+void player_touches_rect_sides(player_t *player,
+                               rect_t object,
+                               int sides[RECT_SIDE_N]);
 
 int player_sound(player_t *player,
                  sound_samples_t *sound_samples);

diff --git a/src/game/level/solid.c b/src/game/level/solid.c
index 65bd879a75ad2e27ff7e1c8f94ff6996c63a53db..569c00f7c75829ec609bf1fe9b18f4860b522e86 100644 (file)
--- a/src/game/level/solid.c
+++ b/src/game/level/solid.c
@@ -22,7 +22,7 @@ void solid_touches_rect_sides(solid_ref_t solid,
         break;
 
     case SOLID_PLAYER:
-        player_rect_object_collide((player_t *) solid.ptr, object, sides);
+        player_touches_rect_sides((player_t *) solid.ptr, object, sides);
         break;
 
     default: {}