From f320eb45d85c9a34cbbd54fadbc583fa62f5b406 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Fri, 14 Feb 2020 21:26:13 +0100 Subject: [PATCH] (menu_animation.c) Need to find a different way to remove this dependency --- menu/gfx_display.c | 2 -- menu/menu_animation.c | 6 +----- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/menu/gfx_display.c b/menu/gfx_display.c index 7efd8034a9..6ab50193cf 100644 --- a/menu/gfx_display.c +++ b/menu/gfx_display.c @@ -1347,8 +1347,6 @@ bool menu_display_reset_textures_list_buffer( return true; } - - /* Teardown; deinitializes and frees all * fonts associated to the menu driver */ void menu_display_font_free(font_data_t *font) diff --git a/menu/menu_animation.c b/menu/menu_animation.c index b3774e58fe..73d12becd7 100644 --- a/menu/menu_animation.c +++ b/menu/menu_animation.c @@ -33,6 +33,7 @@ #undef DG_DYNARR_IMPLEMENTATION #include "menu_animation.h" +#include "menu_driver.h" #include "../performance_counters.h" struct tween @@ -1262,7 +1263,6 @@ static void menu_animation_update_time( * system. We therefore take the same approach as GLUI, * but with a different correction factor (expected * scroll speed is somewhat lower for Ozone) */ -#if 0 switch (menu_driver_ident_id()) { case MENU_DRIVER_ID_RGUI: @@ -1280,10 +1280,6 @@ static void menu_animation_update_time( ticker_pixel_increment *= ((float)video_width / 1920.0f); break; } -#else - if (video_width > 0) - ticker_pixel_increment *= ((float)video_width / 1920.0f); -#endif /* > Update accumulator */ ticker_pixel_accumulator += ticker_pixel_increment;