From c46b288718eca6dbc3bfe43a5b1134b616e620b4 Mon Sep 17 00:00:00 2001 From: P. J. McDermott Date: Thu, 18 Mar 2021 18:41:44 -0400 Subject: main-menu: Remove conditional --- (limited to 'src') diff --git a/src/main-menu.c b/src/main-menu.c index e5b7726..910ecc6 100644 --- a/src/main-menu.c +++ b/src/main-menu.c @@ -175,41 +175,38 @@ db_main_menu(void) &buttons[1]->rect); /* Render game buttons */ - if (n > 0) { - for (i = 0; i < n; ++i) { - buttons[i + 2] = malloc(sizeof(**buttons)); - if (buttons[i + 2] == NULL) { - db_err("Failed to allocate memory"); - goto err; - } - name_desc = malloc((strlen(db_game_get_name(games[i])) + - strlen(db_game_get_desc( - games[i])) + 2) - * sizeof(*name_desc)); - if (name_desc == NULL) { - db_err("Failed to allocate memory"); - goto err; - } - sprintf(name_desc, "%s\n%s", db_game_get_name(games[i]), - db_game_get_desc(games[i])); - buttons[i + 2]->texture_text = _db_main_menu_text(font, - name_desc, &text_color, 608, renderer, - &dest_rect); - if (buttons[i + 2]->texture_text == NULL) { - free(name_desc); - goto err; - } - dest_rect.x = 16; - dest_rect.y = 80 + 48 * i + 2; - SDL_RenderCopy(renderer, buttons[i + 2]->texture_text, NULL, - &dest_rect); - buttons[i + 2]->texture_over = _db_main_menu_text(font, - name_desc, &over_color, 608, renderer, - &dest_rect); + for (i = 0; i < n; ++i) { + buttons[i + 2] = malloc(sizeof(**buttons)); + if (buttons[i + 2] == NULL) { + db_err("Failed to allocate memory"); + goto err; + } + name_desc = malloc((strlen(db_game_get_name(games[i])) + + strlen(db_game_get_desc(games[i])) + 2) + * sizeof(*name_desc)); + if (name_desc == NULL) { + db_err("Failed to allocate memory"); + goto err; + } + sprintf(name_desc, "%s\n%s", db_game_get_name(games[i]), + db_game_get_desc(games[i])); + buttons[i + 2]->texture_text = _db_main_menu_text(font, + name_desc, &text_color, 608, renderer, + &dest_rect); + if (buttons[i + 2]->texture_text == NULL) { free(name_desc); - if (buttons[i + 2]->texture_over == NULL) { - goto err; - } + goto err; + } + dest_rect.x = 16; + dest_rect.y = 80 + 48 * i + 2; + SDL_RenderCopy(renderer, buttons[i + 2]->texture_text, NULL, + &dest_rect); + buttons[i + 2]->texture_over = _db_main_menu_text(font, + name_desc, &over_color, 608, renderer, + &dest_rect); + free(name_desc); + if (buttons[i + 2]->texture_over == NULL) { + goto err; } } -- cgit v0.9.1