From e2d9d21f3f66c6e34ba80548a20d161da5a29ec6 Mon Sep 17 00:00:00 2001 From: Sebastian Krzyszkowiak Date: Sat, 20 Jan 2018 02:44:33 +0100 Subject: [PATCH] BSOD: fix formatting and warnings --- src/utils.c | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/src/utils.c b/src/utils.c index 1b34406..5f9a211 100644 --- a/src/utils.c +++ b/src/utils.c @@ -214,7 +214,6 @@ SYMBOL_EXPORT void FatalError(struct Game* game, bool exit, char* format, ...) { al_flip_display(); al_rest(0.6); - const int offsetx = al_get_display_width(game->display) / 2; const int offsety = al_get_display_height(game->display) * 0.30; const int fonth = al_get_font_line_height(game->_priv.font_bsod); @@ -227,9 +226,9 @@ SYMBOL_EXPORT void FatalError(struct Game* game, bool exit, char* format, ...) { const char* header = game->name; const int headw = al_get_text_width(game->_priv.font_bsod, header); - al_draw_filled_rectangle(offsetx - headw / 2 - 4, (int)(offsety), 4 + offsetx + headw / 2, (int)(offsety) + fonth, al_map_rgb(170, 170, 170)); + al_draw_filled_rectangle(offsetx - headw / 2 - 4, offsety, 4 + offsetx + headw / 2, offsety + fonth, al_map_rgb(170, 170, 170)); - al_draw_text(game->_priv.font_bsod, al_map_rgb(0, 0, 170), offsetx, (int)(offsety), ALLEGRO_ALIGN_CENTRE, header); + al_draw_text(game->_priv.font_bsod, al_map_rgb(0, 0, 170), offsetx, offsety, ALLEGRO_ALIGN_CENTRE, header); const char* header2 = "A fatal exception 0xD3RP has occured at 0028:M00F11NZ in GST SD(01) +"; const int head2w = al_get_text_width(game->_priv.font_bsod, header2); @@ -237,21 +236,22 @@ SYMBOL_EXPORT void FatalError(struct Game* game, bool exit, char* format, ...) { al_draw_text(game->_priv.font_bsod, al_map_rgb(255, 255, 255), offsetx, (int)(offsety + 2 * fonth * 1.25), ALLEGRO_ALIGN_CENTRE, header2); al_draw_textf(game->_priv.font_bsod, al_map_rgb(255, 255, 255), offsetx - head2w / 2, (int)(offsety + 3 * fonth * 1.25), ALLEGRO_ALIGN_LEFT, "%p and system just doesn't know what went wrong.", game); - const int error_len = strlen(text); const int error_w = al_get_text_width(game->_priv.font_bsod, text); const int lines = ceil(error_w / (al_get_display_width(game->display) * 0.8)); - const int letters_per_line = (error_len / lines)+1; - + const int letters_per_line = (error_len / lines) + 1; + int row = 5, l = 0; - for(; l < lines; ++l) { + for (; l < lines; ++l) { int start = l * letters_per_line; - int end = (l+1) * letters_per_line; - if(end >= sizeof(text)) end = sizeof(text)-1; - + unsigned int end = (l + 1) * letters_per_line; + if (end >= sizeof(text)) { + end = sizeof(text) - 1; + } + const char save_char = text[end]; text[end] = '\0'; - + al_draw_text(game->_priv.font_bsod, al_map_rgb(255, 255, 255), offsetx - (error_w / lines) / 2, (int)(offsety + row++ * fonth * 1.25), ALLEGRO_ALIGN_LEFT, text + start); text[end] = save_char; } @@ -262,14 +262,14 @@ SYMBOL_EXPORT void FatalError(struct Game* game, bool exit, char* format, ...) { al_draw_text(game->_priv.font_bsod, al_map_rgb(255, 255, 255), offsetx - head2w / 2, (int)(offsety + row++ * fonth * 1.25), ALLEGRO_ALIGN_LEFT, "* Just kidding, please press any key anyway."); ++row; - if (exit) { + if (exit) { al_draw_text(game->_priv.font_bsod, al_map_rgb(255, 255, 255), offsetx - head2w / 2, (int)(offsety + 11 * fonth * 1.25), ALLEGRO_ALIGN_LEFT, "This is fatal error. My bad."); - al_draw_text(game->_priv.font_bsod, al_map_rgb(255, 255, 255), offsetx, (int)(offsety + (row+2) * fonth * 1.25), ALLEGRO_ALIGN_CENTRE, "Press any key to quit _"); + al_draw_text(game->_priv.font_bsod, al_map_rgb(255, 255, 255), offsetx, (int)(offsety + (row + 2) * fonth * 1.25), ALLEGRO_ALIGN_CENTRE, "Press any key to quit _"); } else { al_draw_text(game->_priv.font_bsod, al_map_rgb(255, 255, 255), offsetx - head2w / 2, (int)(offsety + 11 * fonth * 1.25), ALLEGRO_ALIGN_LEFT, "Anything I can do to help?"); - al_draw_text(game->_priv.font_bsod, al_map_rgb(255, 255, 255), offsetx, (int)(offsety + (row+2) * fonth * 1.25), ALLEGRO_ALIGN_CENTRE, "Press any key to continue _"); + al_draw_text(game->_priv.font_bsod, al_map_rgb(255, 255, 255), offsetx, (int)(offsety + (row + 2) * fonth * 1.25), ALLEGRO_ALIGN_CENTRE, "Press any key to continue _"); } al_flip_display();