X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=src%2Fmain.c;h=46181504ba9572d044ef873ab7bc38ec14c43df8;hb=cf5c164d48262e22592b902fd03293e77bacc34a;hp=7ed089702e39bf5879ddc21264f6c3af6c3c89c9;hpb=fc801c7e9a6ec6c9b88f5c22045db07fe1748a25;p=nothing.git

diff --git a/src/main.c b/src/main.c
index 7ed08970..46181504 100644
--- a/src/main.c
+++ b/src/main.c
@@ -11,7 +11,6 @@
 #include "game/level/player.h"
 #include "game/sound_samples.h"
 #include "game/sprite_font.h"
-#include "math/minmax.h"
 #include "math/point.h"
 #include "sdl/renderer.h"
 #include "system/error.h"
@@ -30,10 +29,10 @@ int main(int argc, char *argv[])
 {
     srand((unsigned int) time(NULL));
 
-    lt_t *const lt = create_lt();
+    Lt *const lt = create_lt();
 
     char *level_filename = NULL;
-    int fps = 60;
+    int fps = 30;
 
     for (int i = 1; i < argc;) {
         if (strcmp(argv[i], "--fps") == 0) {
@@ -135,7 +134,7 @@ int main(int argc, char *argv[])
     };
     const size_t sound_sample_files_count = sizeof(sound_sample_files) / sizeof(char*);
 
-    game_t *const game = PUSH_LT(
+    Game *const game = PUSH_LT(
         lt,
         create_game(
             level_filename,
@@ -148,17 +147,9 @@ int main(int argc, char *argv[])
         RETURN_LT(lt, -1);
     }
 
-    sprite_font_t * const sprite_font =
-        PUSH_LT(lt,
-                create_sprite_font_from_file("fonts/charmap-oldschool_white.bmp", renderer),
-                destroy_sprite_font);
-    if (sprite_font == NULL) {
-        print_current_error_msg("Loading up sprite font");
-        RETURN_LT(lt, -1);
-    }
-
     const Uint8 *const keyboard_state = SDL_GetKeyboardState(NULL);
 
+    SDL_StartTextInput();
     SDL_Event e;
     const int64_t delta_time = (int64_t) roundf(1000.0f / 60.0f);
     int64_t render_timer = (int64_t) roundf(1000.0f / (float) fps);
@@ -187,29 +178,20 @@ int main(int argc, char *argv[])
             RETURN_LT(lt, -1);
         }
 
-        if (game_render(game) < 0) {
-            print_current_error_msg("Failed rendering the game");
-            RETURN_LT(lt, -1);
-        }
-
-        if (sprite_font_render_text(sprite_font,
-                                    renderer,
-                                    vec(0.0f, 0.0f),
-                                    4,
-                                    "HELLO, WORLD!!!") < 0) {
-            print_current_error_msg("Failed rendering debug info");
-            RETURN_LT(lt, -1);
-        }
-
-        const int64_t end_frame_time = (int64_t) SDL_GetTicks();
-
         render_timer -= delta_time;
         if (render_timer <= 0) {
+            if (game_render(game) < 0) {
+                print_current_error_msg("Failed rendering the game");
+                RETURN_LT(lt, -1);
+            }
             SDL_RenderPresent(renderer);
             render_timer = (int64_t) roundf(1000.0f / (float) fps);
         }
 
+        const int64_t end_frame_time = (int64_t) SDL_GetTicks();
+#define max_int64(a, b) (a > b ? a : b)
         SDL_Delay((unsigned int) max_int64(10, delta_time - (end_frame_time - begin_frame_time)));
+#undef max_int64
     }
 
     RETURN_LT(lt, 0);