From 035c99029e59070ea0081ad21795be83c46e1624 Mon Sep 17 00:00:00 2001 From: Kp Date: Thu, 29 Jan 2015 04:27:36 +0000 Subject: [PATCH] Use ntstring for hudmsg --- similar/main/hud.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/similar/main/hud.cpp b/similar/main/hud.cpp index bcf7ecb54..4df1d342c 100644 --- a/similar/main/hud.cpp +++ b/similar/main/hud.cpp @@ -41,11 +41,12 @@ struct hudmsg { fix time; - char message[HUD_MESSAGE_LENGTH+1]; - hudmsg(const fix& t, const char *m) : + ntstring message; + template + hudmsg(const fix& t, M &&m) : time(t) { - snprintf(message, sizeof(message), "%s", m); + message.copy_if(m); } }; @@ -64,7 +65,6 @@ void HUD_clear_messages() HUD_color = -1; } - // ---------------------------------------------------------------------------- // Writes a message on the HUD and checks its timer. void HUD_render_message_frame() @@ -184,7 +184,7 @@ static int HUD_init_message_literal_worth_showing(int class_flag, const char *me if (HUD_messages.count() >= HUD_MAX_NUM_STOR) { - std::copy(HUD_messages.begin() + 1, HUD_messages.end(), HUD_messages.begin()); + std::move(HUD_messages.begin() + 1, HUD_messages.end(), HUD_messages.begin()); HUD_messages.pop_back(); } fix t;