X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=src%2Fgame.c;h=7e59f094b5dccccd2476bb10a8a54adf6f105bdb;hb=6f79ea1241a2e339a261680c5c2b9de07cb91f18;hp=d120cff3f2e209b8af80af857bc927d48d595993;hpb=e1a862cb35193dabdd1bea3c00c8599596862dc2;p=nothing.git

diff --git a/src/game.c b/src/game.c
index d120cff3..7e59f094 100644
--- a/src/game.c
+++ b/src/game.c
@@ -19,21 +19,13 @@
 #include "game/settings.h"
 #include "game/credits.h"
 
-typedef enum Game_state {
-    GAME_STATE_LEVEL = 0,
-    GAME_STATE_LEVEL_PICKER,
-    GAME_STATE_LEVEL_EDITOR,
-    GAME_STATE_CREDITS,
-    GAME_STATE_SETTINGS,
-    GAME_STATE_QUIT
-} Game_state;
 
 typedef struct Game {
     Lt *lt;
 
     Game_state state;
-    Sprite_font *font;
-    LevelPicker *level_picker;
+    Sprite_font font;
+    LevelPicker level_picker;
     LevelEditor *level_editor;
     Credits *credits;
     Level *level;
@@ -46,9 +38,12 @@ typedef struct Game {
     int console_enabled;
 } Game;
 
-static
 void game_switch_state(Game *game, Game_state state)
 {
+    game->cursor.style = CURSOR_STYLE_POINTER;
+    if (state == GAME_STATE_LEVEL_PICKER) {
+        level_picker_clean_selection(&game->level_picker);
+    }
     game->camera = create_camera(game->renderer, game->font);
     game->state = state;
 }
@@ -68,25 +63,11 @@ Game *create_game(const char *level_folder,
     }
     game->lt = lt;
 
-    game->font = PUSH_LT(
-        lt,
-        create_sprite_font_from_file(
-            "./assets/images/charmap-oldschool.bmp",
-            renderer),
-        destroy_sprite_font);
-    if (game->font == NULL) {
-        RETURN_LT(lt, NULL);
-    }
+    game->font.texture = load_bmp_font_texture(
+        renderer,
+        "./assets/images/charmap-oldschool.bmp");
 
-    game->level_picker = PUSH_LT(
-        lt,
-        create_level_picker(
-            game->font,
-            level_folder),
-        destroy_level_picker);
-    if (game->level_picker == NULL) {
-        RETURN_LT(lt, NULL);
-    }
+    level_picker_populate(&game->level_picker, level_folder);
 
     game->credits = PUSH_LT(
         lt,
@@ -124,7 +105,9 @@ Game *create_game(const char *level_folder,
                     SDL_BLENDFACTOR_ONE,
                     SDL_BLENDFACTOR_ZERO,
                     SDL_BLENDOPERATION_ADD)) < 0) {
-            log_warn("SDL error: %s\n", SDL_GetError());
+            log_warn("SDL error while setting blending mode for `%s': %s\n",
+                     cursor_style_tex_files[style],
+                     SDL_GetError());
         }
     }
 
@@ -146,6 +129,7 @@ Game *create_game(const char *level_folder,
 void destroy_game(Game *game)
 {
     trace_assert(game);
+    destroy_level_picker(game->level_picker);
     RETURN_LT0(game->lt);
 }
 
@@ -161,7 +145,7 @@ int game_render(const Game *game)
     } break;
 
     case GAME_STATE_LEVEL_PICKER: {
-        if (level_picker_render(game->level_picker, &game->camera) < 0) {
+        if (level_picker_render(&game->level_picker, &game->camera) < 0) {
             return -1;
         }
     } break;
@@ -221,7 +205,7 @@ int game_update(Game *game, float delta_time)
     trace_assert(game);
     trace_assert(delta_time > 0.0f);
 
-    // TODO: effective scale recalculation should be probably done only when the size of the window is changed
+    // TODO(#1218): effective scale recalculation should be probably done only when the size of the window is changed
     SDL_Rect view_port;
     SDL_RenderGetViewport(game->camera.renderer, &view_port);
     game->camera.effective_scale = effective_scale(&view_port);
@@ -245,15 +229,15 @@ int game_update(Game *game, float delta_time)
     } break;
 
     case GAME_STATE_LEVEL_PICKER: {
-        if (level_picker_update(game->level_picker, delta_time) < 0) {
+        if (level_picker_update(&game->level_picker, &game->camera, delta_time) < 0) {
             return -1;
         }
 
-        if (level_picker_enter_camera_event(game->level_picker, &game->camera) < 0) {
+        if (level_picker_enter_camera_event(&game->level_picker, &game->camera) < 0) {
             return -1;
         }
 
-        const char *level_filename = level_picker_selected_level(game->level_picker);
+        const char *level_filename = level_picker_selected_level(&game->level_picker);
 
         if (level_filename != NULL) {
             if (game_load_level(game, level_filename) < 0) {
@@ -387,7 +371,7 @@ static int game_event_level_picker(Game *game, const SDL_Event *event)
     } break;
     }
 
-    return level_picker_event(game->level_picker, event);
+    return level_picker_event(&game->level_picker, event);
 }
 
 static int game_event_level_editor(Game *game, const SDL_Event *event)
@@ -429,7 +413,8 @@ int game_event(Game *game, const SDL_Event *event)
     } break;
 
     case SDL_KEYDOWN: {
-        if (event->key.keysym.sym == SDLK_q && event->key.keysym.mod & KMOD_CTRL) {
+        if ((event->key.keysym.sym == SDLK_q && event->key.keysym.mod & KMOD_CTRL) ||
+            (event->key.keysym.sym == SDLK_F4 && event->key.keysym.mod & KMOD_ALT)) {
             game_switch_state(game, GAME_STATE_QUIT);
             return 0;
         }
@@ -458,7 +443,7 @@ int game_event(Game *game, const SDL_Event *event)
             switch (event->key.keysym.sym) {
             case SDLK_BACKQUOTE:
             case SDLK_c: {
-                if (event->key.keysym.mod == 0) {
+                if (event->key.keysym.mod == KMOD_NONE || event->key.keysym.mod == KMOD_NUM) {
                     SDL_StartTextInput();
                     game->console_enabled = 1;
                     console_slide_down(game->console);
@@ -539,7 +524,7 @@ int game_input(Game *game,
         return level_input(game->level, keyboard_state, the_stick_of_joy);
 
     case GAME_STATE_LEVEL_PICKER:
-        return level_picker_input(game->level_picker, keyboard_state, the_stick_of_joy);
+        return level_picker_input(&game->level_picker, keyboard_state, the_stick_of_joy);
     }
 
     return 0;