diff options
Diffstat (limited to 'src/menu.c')
| -rw-r--r-- | src/menu.c | 71 |
1 files changed, 22 insertions, 49 deletions
@@ -146,8 +146,6 @@ _mf_menu_play(void *user_data) static struct mftk_widget * _mf_menu_form(SDL_Renderer *renderer, TTF_Font *text_font, - SDL_Color *text_color, SDL_Color *butn_color, - SDL_Color *chkb_color, SDL_Color *chkm_color, struct _mf_menu *menu) { double rand_max_len; @@ -175,54 +173,47 @@ _mf_menu_form(SDL_Renderer *renderer, TTF_Font *text_font, } menu->seed_text = mftk_text_new('0', '9', rand_max_len, menu->seed_buf, - text_font, text_color, SDL_TRUE, &_mf_menu_isdigit, - &_mf_menu_seed, &_mf_menu_play, menu); + text_font, SDL_TRUE, &_mf_menu_isdigit, &_mf_menu_seed, + &_mf_menu_play, menu); menu->enemies_text = mftk_text_new('0', '9', 2, menu->enemies_buf, - text_font, text_color, SDL_TRUE, &_mf_menu_isdigit, + text_font, SDL_TRUE, &_mf_menu_isdigit, &_mf_menu_enemies, &_mf_menu_play, menu); grid = mftk_grid_new(6, 2, MF_ROW_M, MF_COL_M, - mftk_label_new(text_font, "Seed", text_color, renderer), + mftk_label_new(text_font, "Seed", renderer), MFTK_GRID_HALIGN_R|MFTK_GRID_VALIGN_T, menu->seed_text, MFTK_GRID_HALIGN_L|MFTK_GRID_VALIGN_T, - mftk_label_new(text_font, "Size", text_color, renderer), + mftk_label_new(text_font, "Size", renderer), MFTK_GRID_HALIGN_R|MFTK_GRID_VALIGN_T, - 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, + mftk_radio_new(MF_CHK_BTN_W, MF_CHK_BTN_P, MF_CHK_LBL_P, + MF_CHK_ITM_P, text_font, &_mf_menu_size, &_mf_menu_play, menu, renderer, 0, 3, "15x15", "20x20", "30x30"), MFTK_GRID_HALIGN_L|MFTK_GRID_VALIGN_T, - mftk_label_new(text_font, "Enemies", text_color, - renderer), + mftk_label_new(text_font, "Enemies", renderer), MFTK_GRID_HALIGN_R|MFTK_GRID_VALIGN_T, menu->enemies_text, MFTK_GRID_HALIGN_L|MFTK_GRID_VALIGN_T, - mftk_label_new(text_font, "Fog of war", text_color, - renderer), + mftk_label_new(text_font, "Fog of war", renderer), MFTK_GRID_HALIGN_R|MFTK_GRID_VALIGN_T, - mftk_check_new(MF_CHK_BTN_W, MF_CHK_BTN_P, chkb_color, - chkm_color, SDL_TRUE, 0, NULL, NULL, NULL, - &_mf_menu_fow, &_mf_menu_play, menu, renderer), - MFTK_GRID_HALIGN_L|MFTK_GRID_VALIGN_T, - mftk_label_new(text_font, "Reveal maze", text_color, + mftk_check_new(MF_CHK_BTN_W, MF_CHK_BTN_P, SDL_TRUE, 0, + NULL, NULL, &_mf_menu_fow, &_mf_menu_play, menu, renderer), + MFTK_GRID_HALIGN_L|MFTK_GRID_VALIGN_T, + mftk_label_new(text_font, "Reveal maze", renderer), MFTK_GRID_HALIGN_R|MFTK_GRID_VALIGN_T, - mftk_check_new(MF_CHK_BTN_W, MF_CHK_BTN_P, chkb_color, - chkm_color, SDL_FALSE, 0, NULL, NULL, NULL, - &_mf_menu_reveal, &_mf_menu_play, menu, - renderer), + mftk_check_new(MF_CHK_BTN_W, MF_CHK_BTN_P, SDL_FALSE, 0, + NULL, NULL, &_mf_menu_reveal, &_mf_menu_play, + 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_BTN_M, - mftk_button_new(text_font, "Quit", text_color, - butn_color, MF_BTN_P, &_mf_menu_quit, - NULL, renderer), + mftk_button_new(text_font, "Quit", 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_BTN_P, &_mf_menu_play, - menu, renderer), + mftk_button_new(text_font, "Play", MF_BTN_P, + &_mf_menu_play, menu, renderer), MFTK_GRID_HALIGN_L|MFTK_GRID_VALIGN_T ), MFTK_GRID_HALIGN_L|MFTK_GRID_VALIGN_T @@ -240,11 +231,6 @@ mf_menu(SDL_Renderer *renderer) char *font_path = NULL; TTF_Font *title_font = NULL; TTF_Font *text_font = NULL; - SDL_Color form_color; - SDL_Color text_color; - SDL_Color butn_color; - SDL_Color chkb_color; - SDL_Color chkm_color; struct mftk_window *win = NULL; SDL_Event event; @@ -287,26 +273,13 @@ mf_menu(SDL_Renderer *renderer) free(font_path); font_path = NULL; - form_color.r = MF_COLOR_FORM_R, form_color.g = MF_COLOR_FORM_G; - form_color.b = MF_COLOR_FORM_B, form_color.a = MF_COLOR_FORM_A; - text_color.r = MF_COLOR_FORE_R, text_color.g = MF_COLOR_FORE_G; - text_color.b = MF_COLOR_FORE_B, text_color.a = MF_COLOR_FORE_A; - butn_color.r = MF_COLOR_BUTN_R, butn_color.g = MF_COLOR_BUTN_G; - butn_color.b = MF_COLOR_BUTN_B, butn_color.a = MF_COLOR_BUTN_A; - chkb_color.r = MF_COLOR_CHKB_R, chkb_color.g = MF_COLOR_CHKB_G; - chkb_color.b = MF_COLOR_CHKB_B, chkb_color.a = MF_COLOR_CHKB_A; - chkm_color.r = MF_COLOR_CHKM_R, chkm_color.g = MF_COLOR_CHKM_G; - chkm_color.b = MF_COLOR_CHKM_B, chkm_color.a = MF_COLOR_CHKM_A; - win = mftk_window_new(0, 0, mftk_box_new(MF_WINDOW_W, MF_WINDOW_H, 0, 0, - MF_FORM_P, &form_color, + MF_FORM_P, mftk_grid_new(2, 1, MF_TITLE_M, 0, mftk_label_new(title_font, "Maze Fight", - &text_color, renderer), + renderer), MFTK_GRID_HALIGN_C|MFTK_GRID_VALIGN_T, _mf_menu_form(renderer, text_font, - &text_color, &butn_color, - &chkb_color, &chkm_color, &menu), MFTK_GRID_HALIGN_C|MFTK_GRID_VALIGN_T ) |