1 files changed, 8 insertions, 8 deletions

diff --git a/src/game.c b/src/game.c
index 5a410e2..8fb6637 100644
--- a/src/game.c
+++ b/src/game.c
@@ -21,11 +21,11 @@
 #include <SDL_ttf.h>
 #include <errno.h>
 #include <string.h>
+#include "char.h"
 #include "defs.h"
 #include "dirs.h"
 #include "game.h"
 #include "maze.h"
-#include "player.h"
 #include "tk.h"
 #include "util.h"
 
@@ -143,7 +143,7 @@ int
 mf_game(long seed, int size, int fow, int reveal, SDL_Renderer *renderer)
 {
 	struct mf_maze     *maze        = NULL;
-	struct mf_player   *player      = NULL;
+	struct mf_char     *player      = NULL;
 	SDL_Color           maze_color;
 	char               *font_path   = NULL;
 	TTF_Font           *text_font   = NULL;
@@ -228,8 +228,8 @@ mf_game(long seed, int size, int fow, int reveal, SDL_Renderer *renderer)
 			}
 		}
 		if (won == SDL_FALSE) {
-			mf_player_update(player);
-			mf_player_get_vector(player, &game.player_cx,
+			mf_char_update(player);
+			mf_char_get_vector(player, &game.player_cx,
 					&game.player_cy, &game.player_travel,
 					&game.player_dx, &game.player_dy);
 			game.player_x = game.player_cx * MF_WINDOW_H / size;
@@ -245,7 +245,7 @@ mf_game(long seed, int size, int fow, int reveal, SDL_Renderer *renderer)
 				MF_COLOR_BACK_R, MF_COLOR_BACK_G,
 				MF_COLOR_BACK_B, MF_COLOR_BACK_A);
 		SDL_RenderClear(renderer);
-		mf_player_render(player, renderer);
+		mf_char_render(player, renderer);
 		if (fow == SDL_TRUE && _mf_game_fow(renderer, &game, maze,
 					MF_WINDOW_H / size) < 0) {
 			goto err;
@@ -283,7 +283,7 @@ mf_game(long seed, int size, int fow, int reveal, SDL_Renderer *renderer)
 	TTF_CloseFont(text_font);
 	text_font = NULL;
 	mf_maze_destroy(&maze);
-	mf_player_destroy(&player);
+	mf_char_destroy(&player);
 	return 0;
 
  quit:
@@ -291,7 +291,7 @@ mf_game(long seed, int size, int fow, int reveal, SDL_Renderer *renderer)
 	TTF_CloseFont(text_font);
 	text_font = NULL;
 	mf_maze_destroy(&maze);
-	mf_player_destroy(&player);
+	mf_char_destroy(&player);
 	return 1;
 
  err:
@@ -303,6 +303,6 @@ mf_game(long seed, int size, int fow, int reveal, SDL_Renderer *renderer)
 	}
 	mftk_window_destroy(&win);
 	mf_maze_destroy(&maze);
-	mf_player_destroy(&player);
+	mf_char_destroy(&player);
 	return -1;
 }