diff options
author | Fabian Greffrath | 2015-05-05 12:24:19 +0200 |
---|---|---|
committer | Fabian Greffrath | 2015-05-05 12:24:19 +0200 |
commit | 75c479943f4eb0199150b3a46e838f203863ec58 (patch) | |
tree | f2bb18b10d96bfebc13d13d5b0be6c2ea6b1cba2 /src/hexen | |
parent | 90aec9de758dbb178dc19c146d3b0fb22b99342b (diff) | |
download | chocolate-doom-75c479943f4eb0199150b3a46e838f203863ec58.tar.gz chocolate-doom-75c479943f4eb0199150b3a46e838f203863ec58.tar.bz2 chocolate-doom-75c479943f4eb0199150b3a46e838f203863ec58.zip |
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!
Diffstat (limited to 'src/hexen')
-rw-r--r-- | src/hexen/h2_main.c | 2 |
1 files changed, 1 insertions, 1 deletions
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; } |