X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=src%2Fmain.c;h=777b088f0cb86a5e61320daf431a881dbe0a635e;hb=1d0ac498300d1f6c4d748c1333e9188410eccd60;hp=eb397aa74173596cec63b1cee71cd9eda1b13e8e;hpb=e1b808584cf486ac96f5f7354df6611ce32a96b2;p=nothing.git diff --git a/src/main.c b/src/main.c index eb397aa7..777b088f 100644 --- a/src/main.c +++ b/src/main.c @@ -11,9 +11,10 @@ #include "game/level/player.h" #include "game/sound_samples.h" #include "game/sprite_font.h" +#include "math/extrema.h" #include "math/point.h" #include "sdl/renderer.h" -#include "system/error.h" +#include "system/log.h" #include "system/lt.h" #include "system/lt/lt_adapters.h" @@ -22,46 +23,46 @@ 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 *const lt = create_lt(); + Lt *lt = create_lt(); - char *level_filename = NULL; + char *level_folder = NULL; int fps = 30; for (int i = 1; i < argc;) { if (strcmp(argv[i], "--fps") == 0) { if (i + 1 < argc) { if (sscanf(argv[i + 1], "%d", &fps) == 0) { - fprintf(stderr, "Cannot parse FPS: %s is not a number\n", argv[i + 1]); + log_fail("Cannot parse FPS: %s is not a number\n", argv[i + 1]); print_usage(stderr); RETURN_LT(lt, -1); } i += 2; } else { - fprintf(stderr, "Value of FPS is not provided\n"); + log_fail("Value of FPS is not provided\n"); print_usage(stderr); RETURN_LT(lt, -1); } } else { - level_filename = argv[i]; + level_folder = argv[i]; i++; } } - if (level_filename == NULL) { - fprintf(stderr, "Path to level file is not provided\n"); + 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) { - print_error_msg(ERROR_TYPE_SDL2, "Could not initialize SDL"); + log_fail("Could not initialize SDL: %s\n", SDL_GetError()); RETURN_LT(lt, -1); } PUSH_LT(lt, 42, SDL_Quit_lt); @@ -78,7 +79,7 @@ int main(int argc, char *argv[]) SDL_DestroyWindow); if (window == NULL) { - print_error_msg(ERROR_TYPE_SDL2, "Could not create SDL window"); + log_fail("Could not create SDL window: %s\n", SDL_GetError()); RETURN_LT(lt, -1); } @@ -87,11 +88,11 @@ int main(int argc, char *argv[]) SDL_CreateRenderer(window, -1, SDL_RENDERER_ACCELERATED | SDL_RENDERER_PRESENTVSYNC), SDL_DestroyRenderer); if (renderer == NULL) { - print_error_msg(ERROR_TYPE_SDL2, "Could not create SDL renderer"); + log_fail("Could not create SDL renderer: %s\n", SDL_GetError()); RETURN_LT(lt, -1); } if (SDL_SetRenderDrawBlendMode(renderer, SDL_BLENDMODE_BLEND) < 0) { - print_error_msg(ERROR_TYPE_SDL2, "Could not set up blending mode for the renderer"); + log_fail("Could not set up blending mode for the renderer: %s\n", SDL_GetError()); RETURN_LT(lt, -1); } @@ -101,19 +102,19 @@ int main(int argc, char *argv[]) the_stick_of_joy = PUSH_LT(lt, SDL_JoystickOpen(0), SDL_JoystickClose); if (the_stick_of_joy == NULL) { - print_error_msg(ERROR_TYPE_SDL2, "Could not open 0th Stick of the Joy: %s\n"); + log_fail("Could not open 0th Stick of the Joy: %s\n", SDL_GetError()); RETURN_LT(lt, -1); } - printf("Opened Joystick 0\n"); - printf("Name: %s\n", SDL_JoystickNameForIndex(0)); - printf("Number of Axes: %d\n", SDL_JoystickNumAxes(the_stick_of_joy)); - printf("Number of Buttons: %d\n", SDL_JoystickNumButtons(the_stick_of_joy)); - printf("Number of Balls: %d\n", SDL_JoystickNumBalls(the_stick_of_joy)); + log_info("Opened Joystick 0\n"); + log_info("Name: %s\n", SDL_JoystickNameForIndex(0)); + log_info("Number of Axes: %d\n", SDL_JoystickNumAxes(the_stick_of_joy)); + log_info("Number of Buttons: %d\n", SDL_JoystickNumButtons(the_stick_of_joy)); + log_info("Number of Balls: %d\n", SDL_JoystickNumBalls(the_stick_of_joy)); SDL_JoystickEventState(SDL_ENABLE); } else { - fprintf(stderr, "[WARNING] Could not find any Sticks of the Joy\n"); + log_warn("Could not find any Sticks of the Joy\n"); } if (Mix_OpenAudio( @@ -121,7 +122,7 @@ int main(int argc, char *argv[]) MIX_DEFAULT_FORMAT, 2, 1024) < 0) { - print_error_msg(ERROR_TYPE_SDL2_MIXER, "Could not initialize the audio\n"); + log_fail("Could not initialize the audio: %s\n", Mix_GetError()); RETURN_LT(lt, -1); } PUSH_LT(lt, 42, Mix_CloseAudio_lt); @@ -137,13 +138,12 @@ int main(int argc, char *argv[]) Game *const game = PUSH_LT( lt, create_game( - level_filename, + level_folder, sound_sample_files, sound_sample_files_count, renderer), destroy_game); if (game == NULL) { - print_current_error_msg("Could not create the game object"); RETURN_LT(lt, -1); } @@ -158,30 +158,25 @@ int main(int argc, char *argv[]) while (!game_over_check(game) && SDL_PollEvent(&e)) { if (game_event(game, &e) < 0) { - print_current_error_msg("Failed handling event"); RETURN_LT(lt, -1); } } if (game_input(game, keyboard_state, the_stick_of_joy) < 0) { - print_current_error_msg("Failed handling input"); RETURN_LT(lt, -1); } if (game_update(game, (float) delta_time * 0.001f) < 0) { - print_current_error_msg("Failed handling updating"); RETURN_LT(lt, -1); } if (game_sound(game) < 0) { - print_current_error_msg("Failed handling the sound"); RETURN_LT(lt, -1); } 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); @@ -189,9 +184,7 @@ int main(int argc, char *argv[]) } 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);