X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=src%2Fmain.c;h=a369a61b5f565a780ccb61157f1616cfa63a8c61;hb=2b1bf548117333c844f5a322b1b8a504f4e0f0f6;hp=e547e6b371fb89e135f89c8f6f0fe6ac339aee15;hpb=eaa7ee235a086ffe846f4400d0b3d42d9847b6eb;p=nothing.git diff --git a/src/main.c b/src/main.c index e547e6b3..a369a61b 100644 --- a/src/main.c +++ b/src/main.c @@ -1,5 +1,4 @@ -#include -#include +#include #include #include @@ -16,23 +15,21 @@ #include "sdl/renderer.h" #include "system/log.h" #include "system/lt.h" -#include "system/lt/lt_adapters.h" #define SCREEN_WIDTH 800 #define SCREEN_HEIGHT 600 static void print_usage(FILE *stream) { - fprintf(stream, "Usage: nothing [--fps ] \n"); + fprintf(stream, "Usage: nothing [--fps ]\n"); } int main(int argc, char *argv[]) { srand((unsigned int) time(NULL)); - Lt lt = {0}; + Lt *lt = create_lt(); - char *level_folder = NULL; int fps = 30; for (int i = 1; i < argc;) { @@ -50,22 +47,17 @@ int main(int argc, char *argv[]) RETURN_LT(lt, -1); } } else { - level_folder = argv[i]; - i++; + log_fail("Unknown flag %s\n", argv[i]); + print_usage(stderr); + RETURN_LT(lt, -1); } } - if (level_folder == NULL) { - log_fail("Path to level file is not provided\n"); - print_usage(stderr); - RETURN_LT(lt, -1); - } - if (SDL_Init(SDL_INIT_EVERYTHING) < 0) { log_fail("Could not initialize SDL: %s\n", SDL_GetError()); RETURN_LT(lt, -1); } - PUSH_LT(lt, 42, SDL_Quit_lt); + PUSH_LT(lt, 42, SDL_Quit); SDL_ShowCursor(SDL_DISABLE); @@ -117,16 +109,6 @@ int main(int argc, char *argv[]) log_warn("Could not find any Sticks of the Joy\n"); } - if (Mix_OpenAudio( - MIX_DEFAULT_FREQUENCY, - MIX_DEFAULT_FORMAT, - 2, - 1024) < 0) { - log_fail("Could not initialize the audio: %s\n", Mix_GetError()); - RETURN_LT(lt, -1); - } - PUSH_LT(lt, 42, Mix_CloseAudio_lt); - // ------------------------------ const char * sound_sample_files[] = { @@ -138,7 +120,7 @@ int main(int argc, char *argv[]) Game *const game = PUSH_LT( lt, create_game( - level_folder, + "./levels/", sound_sample_files, sound_sample_files_count, renderer),