shithub: choc

Download patch

ref: 75c479943f4eb0199150b3a46e838f203863ec58
parent: 90aec9de758dbb178dc19c146d3b0fb22b99342b
author: Fabian Greffrath <[email protected]>
date: Tue May 5 08:24:19 EDT 2015

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!

--- a/src/hexen/h2_main.c

+++ b/src/hexen/h2_main.c

@@ -855,7 +855,7 @@

     player_t *player;

     player = &players[consoleplayer];

-    if (player->messageTics <= 0 || !player->message)

+    if (player->messageTics <= 0)

     {                           // No message

         return;

     }