Remove redundant logging

[nothing.git] / src / main.c

diff --git a/src/main.c b/src/main.c
index b0adb26751a3ed9c671f03e748c6292d9d33d2fe..40bfd880d855c481fb12892349a0adcdee323ccd 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -4,28 +4,31 @@
 #include <SDL2/SDL.h>
 #include <SDL2/SDL_mixer.h>
 
-#include "./player.h"
+#include "./game/level/player.h"
 #include "./platforms.h"
 #include "./error.h"
 #include "./game.h"
 #include "./lt.h"
+#include "./path.h"
+#include "./point.h"
+#include "./game/sound_medium.h"
 
 #define SCREEN_WIDTH 800
 #define SCREEN_HEIGHT 600
 #define GAME_FPS 60
 
-/* LT module adapter for SDL_Quit */
-static void SDL_Quit_lt(void* ignored)
+/* LT module adapter for Mix_CloseAudio */
+static void Mix_CloseAudio_lt(void* ignored)
 {
     (void) ignored;
-    SDL_Quit();
+    Mix_CloseAudio();
 }
 
-/* LT module adapter for Mix_Quit */
-static void Mix_Quit_lt(void* ignored)
+/* LT module adapter for SDL_Quit */
+static void SDL_Quit_lt(void* ignored)
 {
     (void) ignored;
-    Mix_Quit();
+    SDL_Quit();
 }
 
 static void print_usage(FILE *stream)
@@ -50,20 +53,13 @@ int main(int argc, char *argv[])
     }
     PUSH_LT(lt, 42, SDL_Quit_lt);
 
-    if ((Mix_Init(MIX_INIT_MP3) & MIX_INIT_MP3) != MIX_INIT_MP3) {
-        print_error_msg(ERROR_TYPE_SDL2_MIXER, "Could not initialize SDL_mixer");
-        RETURN_LT(lt, -1);
-    }
-    PUSH_LT(lt, 42, Mix_Quit_lt);
-
-    if (Mix_OpenAudio(22050, AUDIO_S16SYS, 2, 640) < 0) {
-        print_error_msg(ERROR_TYPE_SDL2_MIXER, "Could not initialize SDL_mixer twice");
-        RETURN_LT(lt, -1);
-    }
-
     SDL_Window *const window = PUSH_LT(
         lt,
-        SDL_CreateWindow("Nothing", 100, 100, SCREEN_WIDTH, SCREEN_HEIGHT, SDL_WINDOW_SHOWN),
+        SDL_CreateWindow(
+            "Nothing",
+            100, 100,
+            SCREEN_WIDTH, SCREEN_HEIGHT,
+            SDL_WINDOW_SHOWN | SDL_WINDOW_RESIZABLE),
         SDL_DestroyWindow);
 
     if (window == NULL) {
@@ -105,16 +101,48 @@ int main(int argc, char *argv[])
         fprintf(stderr, "[WARNING] Could not find any Sticks of the Joy\n");
     }
 
+    if (Mix_OpenAudio(
+            MIX_DEFAULT_FREQUENCY,
+            MIX_DEFAULT_FORMAT,
+            2,
+            1024) < 0) {
+        print_error_msg(ERROR_TYPE_SDL2_MIXER, "Could not initialize the audio\n");
+        RETURN_LT(lt, -1);
+    }
+    PUSH_LT(lt, 42, Mix_CloseAudio_lt);
+
+    Mix_Chunk * sound_samples[] = {
+        PUSH_LT(lt, Mix_LoadWAV("./sounds/nothing.wav"), Mix_FreeChunk),
+        PUSH_LT(lt, Mix_LoadWAV("./sounds/something.wav"), Mix_FreeChunk)
+    };
+    const size_t sound_samples_count = sizeof(sound_samples) / sizeof(Mix_Chunk*);
+
+    sound_medium_t *sound_medium =
+        PUSH_LT(
+            lt,
+            create_sound_medium(sound_samples, sound_samples_count, 0, MIX_CHANNELS - 1),
+            destroy_sound_medium);
+    if (sound_medium == NULL) {
+        print_current_error_msg("Could not create sound medium");
+        RETURN_LT(lt, -1);
+    }
+
     // ------------------------------
 
-    game_t *const game = PUSH_LT(lt, create_game(argv[1]), destroy_game);
+    char *sounds_folder = PUSH_LT(lt, base_path_folder("sounds"), free);
+    if (sounds_folder == NULL) {
+        print_current_error_msg("Could not get the sounds folder");
+        RETURN_LT(lt, -1);
+    }
+
+    game_t *const game = PUSH_LT(lt, create_game(argv[1], sound_medium), destroy_game);
     if (game == NULL) {
         print_current_error_msg("Could not create the game object");
         RETURN_LT(lt, -1);
     }
 
     const Uint8 *const keyboard_state = SDL_GetKeyboardState(NULL);
-    const Uint32 delay_ms = (Uint32) roundf(1000.0f / GAME_FPS);
+    const float delay_ms = 1.0f / GAME_FPS;
     SDL_Event e;
     while (!game_over_check(game)) {
         while (!game_over_check(game) && SDL_PollEvent(&e)) {
@@ -129,13 +157,18 @@ int main(int argc, char *argv[])
             RETURN_LT(lt, -1);
         }
 
+        if (game_render(game, renderer) < 0) {
+            print_current_error_msg("Failed rendering the game");
+            RETURN_LT(lt, -1);
+        }
+
         if (game_update(game, delay_ms) < 0) {
             print_current_error_msg("Failed handling updating");
             RETURN_LT(lt, -1);
         }
 
-        if (game_render(game, renderer) < 0) {
-            print_current_error_msg("Failed rendering the game");
+        if (game_sound(game) < 0) {
+            print_current_error_msg("Failed handling the sound");
             RETURN_LT(lt, -1);
         }
     }