From db42c2bc560c5f75563948cbdfad4d639e4a9dde Mon Sep 17 00:00:00 2001 From: Kp Date: Mon, 25 Jul 2016 03:48:09 +0000 Subject: [PATCH] Fold game_draw_multi_message gr_printf calls --- similar/main/gamerend.cpp | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/similar/main/gamerend.cpp b/similar/main/gamerend.cpp index d79c20136..1e304f831 100644 --- a/similar/main/gamerend.cpp +++ b/similar/main/gamerend.cpp @@ -94,18 +94,17 @@ static void game_draw_multi_message() { if (!(Game_mode&GM_MULTI)) return; - if (multi_sending_message[Player_num]) - { - gr_set_curfont(GAME_FONT); - gr_set_fontcolor(BM_XRGB(0,63,0),-1); - gr_printf(0x8000, (LINE_SPACING*5)+FSPACY(1), "%s: %s_", TXT_MESSAGE, Network_message.data()); - } - else if (multi_defining_message) - { - gr_set_curfont(GAME_FONT); - gr_set_fontcolor(BM_XRGB(0,63,0),-1); - gr_printf(0x8000, (LINE_SPACING*5)+FSPACY(1), "%s #%d: %s_", TXT_MACRO, multi_defining_message, Network_message.data()); - } + const auto sending = multi_sending_message[Player_num]; + int defining; + if (!sending && !(defining = multi_defining_message)) + return; + gr_set_curfont(GAME_FONT); + gr_set_fontcolor(BM_XRGB(0,63,0),-1); + const auto &&y = (LINE_SPACING * 5) + FSPACY(1); + if (sending) + gr_printf(0x8000, y, "%s: %s_", TXT_MESSAGE, Network_message.data()); + else + gr_printf(0x8000, y, "%s #%d: %s_", TXT_MACRO, defining, Network_message.data()); } static void show_framerate()