From 111a7fea9256681a5a623b1bfa7f9537c9c66484 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Thu, 15 Aug 2019 15:56:30 +0200 Subject: [PATCH] (Menu widgets) Should use MAX macro here from retro_miscellaneous.h --- menu/widgets/menu_widgets.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/menu/widgets/menu_widgets.c b/menu/widgets/menu_widgets.c index e33dc79af3..bbc98678fd 100644 --- a/menu/widgets/menu_widgets.c +++ b/menu/widgets/menu_widgets.c @@ -36,15 +36,12 @@ #include #include #include +#include #ifndef PI #define PI 3.14159265359f #endif -#ifndef max -#define max(x, y) x >= y ? x : y -#endif - /* TODO: Fix context reset freezing everything in place (probably kills animations when it shouldn't anymore) */ static float msg_queue_background[16] = COLOR_HEX_TO_FLOAT(0x3A3A3A, 1.0f); @@ -2218,7 +2215,7 @@ static void menu_widgets_start_achievement_notification() settings_t *settings = config_get_ptr(); menu_animation_ctx_entry_t entry; cheevo_height = settings->floats.video_font_size * 4; - cheevo_width = max( + cheevo_width = MAX( font_driver_get_message_width(font_regular, msg_hash_to_str(MSG_ACHIEVEMENT_UNLOCKED), 0, 1), font_driver_get_message_width(font_regular, cheevo_title, 0, 1) );