summaryrefslogtreecommitdiffstats
path: root/src/menu.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/menu.c')
-rw-r--r--src/menu.c29
1 files changed, 13 insertions, 16 deletions
diff --git a/src/menu.c b/src/menu.c
index 24a4cac..a4f7457 100644
--- a/src/menu.c
+++ b/src/menu.c
@@ -26,6 +26,7 @@
#include <time.h>
#include "defs.h"
#include "dirs.h"
+#include "game.h"
#include "maze.h"
#include "menu.h"
#include "tk.h"
@@ -34,10 +35,11 @@
const int MF_MENU_SIZES_[] = {15, 20, 30};
struct _mf_menu {
- long seed;
- int size;
- int fow;
- int reveal;
+ long seed;
+ int size;
+ int fow;
+ int reveal;
+ SDL_Renderer *renderer;
};
static int
@@ -91,14 +93,8 @@ _mf_menu_play(void *user_data)
{
struct _mf_menu *menu = (struct _mf_menu *) user_data;
- SDL_LogInfo(SDL_LOG_CATEGORY_APPLICATION, "Playing with seed %ld, "
- "size %dx%d, fog of war %s, and maze %s",
- menu->seed, menu->size, menu->size,
- menu->fow ? "enabled" : "disabled",
- menu->reveal ? "revealed" : "hidden");
- /* TODO */
-
- return 0;
+ return mf_game(menu->seed, menu->size, menu->fow, menu->reveal,
+ menu->renderer);
}
static struct mftk_widget *
@@ -202,10 +198,11 @@ mf_menu(SDL_Renderer *renderer)
maze_color.b = MF_COLOR_MAZE_B;
maze_color.a = MF_COLOR_MAZE_A;
- menu.seed = rand();
- menu.size = 15;
- menu.fow = SDL_TRUE;
- menu.reveal = SDL_FALSE;
+ menu.seed = rand();
+ menu.size = 15;
+ menu.fow = SDL_TRUE;
+ menu.reveal = SDL_FALSE;
+ 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);