From d15347f16f12043133bd6a60804b55e268a15119 Mon Sep 17 00:00:00 2001 From: Kp Date: Sun, 8 Dec 2013 23:37:40 +0000 Subject: [PATCH] Use HUD_init_message_literal instead of HUD_init_message where possible --- common/main/hudmsg.h | 2 ++ similar/main/hud.cpp | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/common/main/hudmsg.h b/common/main/hudmsg.h index bec64e758..2abbe0798 100644 --- a/common/main/hudmsg.h +++ b/common/main/hudmsg.h @@ -3,6 +3,7 @@ #include #include "dxxsconf.h" +#include "fmtcheck.h" #ifdef __cplusplus @@ -20,6 +21,7 @@ extern int HUD_toolong; extern void HUD_clear_messages(); extern void HUD_render_message_frame(); int HUD_init_message(int class_flag, const char * format, ... ) __attribute_format_printf(2, 3); +#define HUD_init_message(A1,F,...) dxx_call_printf_checked(HUD_init_message,HUD_init_message_literal,(A1),(F),##__VA_ARGS__) int HUD_init_message_va(int class_flag, const char * format, va_list args) __attribute_format_printf(2, 0); int HUD_init_message_literal(int class_flag, const char *str); diff --git a/similar/main/hud.cpp b/similar/main/hud.cpp index 0f3081c75..7b57a56da 100644 --- a/similar/main/hud.cpp +++ b/similar/main/hud.cpp @@ -197,7 +197,7 @@ static int HUD_init_message_literal_worth_showing(int class_flag, const char *me return 1; } -int HUD_init_message(int class_flag, const char * format, ... ) +int (HUD_init_message)(int class_flag, const char * format, ... ) { int ret; va_list args;