From 75c479943f4eb0199150b3a46e838f203863ec58 Mon Sep 17 00:00:00 2001 From: Fabian Greffrath Date: Tue, 5 May 2015 12:24:19 +0200 Subject: warnings: fix "address of array .. will always evaluate to 'true'" Remove a redundant check from an ORer condition. Unlike in Doom, in Hexen the player->message element is not a pointer, but a char[80] array. Its address will never be NULL and thus will never get interpreted as "false". Hence, the check for "!player->message" will never be "true" and a check for "|| false)" is a no-op. Thanks to @edward-san for finding this with clang-3.6! --- src/hexen/h2_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/hexen/h2_main.c b/src/hexen/h2_main.c index 1786a1fb..01ba726c 100644 --- a/src/hexen/h2_main.c +++ b/src/hexen/h2_main.c @@ -855,7 +855,7 @@ static void DrawMessage(void) player_t *player; player = &players[consoleplayer]; - if (player->messageTics <= 0 || !player->message) + if (player->messageTics <= 0) { // No message return; } -- cgit v1.2.3