menu, game: Rename macros

3 files changed, 43 insertions, 43 deletions

diff --git a/src/defs.h b/src/defs.h
index 732630c..8a4ea63 100644
--- a/src/defs.h
+++ b/src/defs.h
@@ -24,22 +24,23 @@
 #define MF_WINDOW_W 640  /* Window width */
 #define MF_WINDOW_H 480  /* Window height */
 
-/* Splash menu */
-#define MF_SPLASH_MAZE_CELL_W  16  /* Background maze cell width */
-#define MF_SPLASH_WINDOW_P     24  /* Window padding */
-#define MF_SPLASH_FORM_P       24  /* Form padding */
-#define MF_SPLASH_TITLE_M      24  /* Margin under title */
-#define MF_SPLASH_ROW_M        16  /* Margin between rows */
-#define MF_SPLASH_COL_M        16  /* Margin between labels and entries */
-#define MF_SPLASH_LBL_M         8  /* Margin between radio buttons and labels */
-#define MF_SPLASH_CHK_BTN_W    16  /* Radio button and check box width */
-#define MF_SPLASH_CHK_BTN_P     2  /* Radio button and check box padding */
-#define MF_SPLASH_CHK_LBL_P     8  /* Radio button and check box label pad */
-#define MF_SPLASH_CHK_ITM_P     8  /* Radio button and check box label pad */
-#define MF_SPLASH_BTN_M         8  /* Margin between buttons */
-#define MF_SPLASH_BTN_P         8  /* Button padding */
-#define MF_SPLASH_TITLE_FONT_S 48  /* Title font size */
-#define MF_SPLASH_TEXT_FONT_S  16  /* Regular text font size */
+/* Menu maze */
+#define MF_MENU_MAZE_CELL_W  16  /* Background maze cell width */
+
+/* Form dimensions */
+#define MF_FORM_P       24  /* Form padding */
+#define MF_TITLE_M      24  /* Margin under title */
+#define MF_ROW_M        16  /* Margin between rows */
+#define MF_COL_M        16  /* Margin between labels and entries */
+#define MF_LBL_M         8  /* Margin between radio buttons and labels */
+#define MF_CHK_BTN_W    16  /* Radio button and check box width */
+#define MF_CHK_BTN_P     2  /* Radio button and check box padding */
+#define MF_CHK_LBL_P     8  /* Radio button and check box label pad */
+#define MF_CHK_ITM_P     8  /* Radio button and check box label pad */
+#define MF_BTN_M         8  /* Margin between buttons */
+#define MF_BTN_P         8  /* Button padding */
+#define MF_TITLE_FONT_S 48  /* Title font size */
+#define MF_TEXT_FONT_S  16  /* Regular text font size */
 
 /* Colors */
 #define MF_COLOR_BACK_R 0xAF  /* Background color */
diff --git a/src/game.c b/src/game.c
index 7fce1c1..bc43faa 100644
--- a/src/game.c
+++ b/src/game.c
@@ -42,7 +42,7 @@ _mf_game_form(SDL_Renderer *renderer, TTF_Font *text_font,
 	butn_color.b = MF_COLOR_BUTN_B, butn_color.a = MF_COLOR_BUTN_A;
 
 	return mftk_button_new(text_font, "Exit", text_color, &butn_color,
-			MF_SPLASH_BTN_P, &_mf_game_exit, NULL, renderer);
+			MF_BTN_P, &_mf_game_exit, NULL, renderer);
 }
 
 int
@@ -68,7 +68,7 @@ mf_game(long seed, int size, int fow, int reveal, SDL_Renderer *renderer)
 	maze_color.a = MF_COLOR_MAZE_A;
 
 	font_path = mf_strcat(mf_get_fonts_dir(), "/FifteenTwenty-Regular.ttf");
-	text_font = TTF_OpenFont(font_path, MF_SPLASH_TEXT_FONT_S);
+	text_font = TTF_OpenFont(font_path, MF_TEXT_FONT_S);
 	if (text_font == NULL) {
 		SDL_LogError(SDL_LOG_CATEGORY_APPLICATION,
 				"Couldn't open font: %s",
@@ -86,7 +86,7 @@ mf_game(long seed, int size, int fow, int reveal, SDL_Renderer *renderer)
 	win = mftk_window_new(MF_WINDOW_H, 0, mftk_box_new(
 				MF_WINDOW_W - MF_WINDOW_H, MF_WINDOW_H,
 				MF_WINDOW_W - MF_WINDOW_H, MF_WINDOW_H,
-				MF_SPLASH_FORM_P, &form_color,
+				MF_FORM_P, &form_color,
 				_mf_game_form(renderer, text_font,
 					&text_color)));
 
diff --git a/src/menu.c b/src/menu.c
index a4f7457..1664edb 100644
--- a/src/menu.c
+++ b/src/menu.c
@@ -124,7 +124,7 @@ _mf_menu_form(SDL_Renderer *renderer, TTF_Font *text_font,
 		return NULL;
 	}
 
-	grid = mftk_grid_new(5, 2, MF_SPLASH_ROW_M, MF_SPLASH_COL_M,
+	grid = mftk_grid_new(5, 2, MF_ROW_M, MF_COL_M,
 			mftk_label_new(text_font, "Seed", text_color, renderer),
 				MFTK_GRID_HALIGN_R|MFTK_GRID_VALIGN_T,
 			mftk_text_new('0', '9', rand_max_len, seed_buf,
@@ -132,36 +132,35 @@ _mf_menu_form(SDL_Renderer *renderer, TTF_Font *text_font,
 				MFTK_GRID_HALIGN_L|MFTK_GRID_VALIGN_T,
 			mftk_label_new(text_font, "Size", text_color, renderer),
 				MFTK_GRID_HALIGN_R|MFTK_GRID_VALIGN_T,
-			mftk_radio_new(MF_SPLASH_CHK_BTN_W, MF_SPLASH_CHK_BTN_P,
-				&chkb_color, &chkm_color, MF_SPLASH_CHK_LBL_P,
-				MF_SPLASH_CHK_ITM_P, text_font, text_color,
-				&_mf_menu_size, menu, renderer, 0, 3,
-				"15x15", "20x20", "30x30"),
+			mftk_radio_new(MF_CHK_BTN_W, MF_CHK_BTN_P, &chkb_color,
+				&chkm_color, MF_CHK_LBL_P, MF_CHK_ITM_P,
+				text_font, text_color, &_mf_menu_size, menu,
+				renderer, 0, 3, "15x15", "20x20", "30x30"),
 				MFTK_GRID_HALIGN_L|MFTK_GRID_VALIGN_T,
 			mftk_label_new(text_font, "Fog of war", text_color,
 				renderer),
 				MFTK_GRID_HALIGN_R|MFTK_GRID_VALIGN_T,
-			mftk_check_new(MF_SPLASH_CHK_BTN_W, MF_SPLASH_CHK_BTN_P,
-				&chkb_color, &chkm_color, SDL_TRUE, 0, NULL,
-				NULL, NULL, &_mf_menu_fow, menu, renderer),
+			mftk_check_new(MF_CHK_BTN_W, MF_CHK_BTN_P, &chkb_color,
+				&chkm_color, SDL_TRUE, 0, NULL, NULL, NULL,
+				&_mf_menu_fow, menu, renderer),
 				MFTK_GRID_HALIGN_L|MFTK_GRID_VALIGN_T,
 			mftk_label_new(text_font, "Reveal maze", text_color,
 				renderer),
 				MFTK_GRID_HALIGN_R|MFTK_GRID_VALIGN_T,
-			mftk_check_new(MF_SPLASH_CHK_BTN_W, MF_SPLASH_CHK_BTN_P,
-				&chkb_color, &chkm_color, SDL_FALSE, 0, NULL,
-				NULL, NULL, &_mf_menu_reveal, menu, renderer),
+			mftk_check_new(MF_CHK_BTN_W, MF_CHK_BTN_P, &chkb_color,
+				&chkm_color, SDL_FALSE, 0, NULL, NULL, NULL,
+				&_mf_menu_reveal, menu, renderer),
 				MFTK_GRID_HALIGN_L|MFTK_GRID_VALIGN_T,
 			mftk_blank_new(),
 				MFTK_GRID_HALIGN_R|MFTK_GRID_VALIGN_T,
-			mftk_grid_new(1, 2, 0, MF_SPLASH_BTN_M,
+			mftk_grid_new(1, 2, 0, MF_BTN_M,
 				mftk_button_new(text_font, "Quit", text_color,
-					&butn_color, MF_SPLASH_BTN_P,
-					&_mf_menu_quit, NULL, renderer),
+					&butn_color, MF_BTN_P, &_mf_menu_quit,
+					NULL, renderer),
 					MFTK_GRID_HALIGN_L|MFTK_GRID_VALIGN_T,
 				mftk_button_new(text_font, "Play", text_color,
-					&butn_color, MF_SPLASH_BTN_P,
-					&_mf_menu_play, menu, renderer),
+					&butn_color, MF_BTN_P, &_mf_menu_play,
+					menu, renderer),
 					MFTK_GRID_HALIGN_L|MFTK_GRID_VALIGN_T
 				),
 				MFTK_GRID_HALIGN_L|MFTK_GRID_VALIGN_T
@@ -188,8 +187,8 @@ mf_menu(SDL_Renderer *renderer)
 
 	/* Create maze */
 	maze = mf_maze_new(time(NULL),
-			MF_WINDOW_W / MF_SPLASH_MAZE_CELL_W,
-			MF_WINDOW_H / MF_SPLASH_MAZE_CELL_W);
+			MF_WINDOW_W / MF_MENU_MAZE_CELL_W,
+			MF_WINDOW_H / MF_MENU_MAZE_CELL_W);
 	if (maze == NULL) {
 		goto err;
 	}
@@ -205,14 +204,14 @@ mf_menu(SDL_Renderer *renderer)
 	menu.renderer = renderer;
 
 	font_path = mf_strcat(mf_get_fonts_dir(), "/FifteenTwenty-Regular.ttf");
-	title_font = TTF_OpenFont(font_path, MF_SPLASH_TITLE_FONT_S);
+	title_font = TTF_OpenFont(font_path, MF_TITLE_FONT_S);
 	if (title_font == NULL) {
 		SDL_LogError(SDL_LOG_CATEGORY_APPLICATION,
 				"Couldn't open font: %s",
 				TTF_GetError());
 		goto err;
 	}
-	text_font = TTF_OpenFont(font_path, MF_SPLASH_TEXT_FONT_S);
+	text_font = TTF_OpenFont(font_path, MF_TEXT_FONT_S);
 	if (text_font == NULL) {
 		SDL_LogError(SDL_LOG_CATEGORY_APPLICATION,
 				"Couldn't open font: %s",
@@ -228,8 +227,8 @@ mf_menu(SDL_Renderer *renderer)
 	text_color.b = MF_COLOR_FORE_B, text_color.a = MF_COLOR_FORE_A;
 
 	win = mftk_window_new(0, 0, mftk_box_new(MF_WINDOW_W, MF_WINDOW_H, 0, 0,
-				MF_SPLASH_FORM_P, &form_color,
-				mftk_grid_new(2, 1, MF_SPLASH_TITLE_M, 0,
+				MF_FORM_P, &form_color,
+				mftk_grid_new(2, 1, MF_TITLE_M, 0,
 					mftk_label_new(title_font, "Maze Fight",
 						&text_color, renderer),
 					MFTK_GRID_HALIGN_C|MFTK_GRID_VALIGN_T,
@@ -272,7 +271,7 @@ mf_menu(SDL_Renderer *renderer)
 				MF_COLOR_BACK_B, MF_COLOR_BACK_A);
 		SDL_RenderClear(renderer);
 		mf_maze_render(maze, renderer, &maze_color,
-				MF_SPLASH_MAZE_CELL_W);
+				MF_MENU_MAZE_CELL_W);
 		mftk_window_render(win, renderer);
 		SDL_RenderPresent(renderer);
 	}