From 871be001f76e91bc8f632318748276119f3348a2 Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Wed, 16 Aug 2006 13:31:40 +0000 Subject: Convert the "short ciruit operator madness" to plain and simple code that doesn't cause warnings in gcc 4.1.x. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@10613 a1c6a512-1295-4272-9138-f99709370657 --- apps/plugins/doom/d_main.c | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) (limited to 'apps') diff --git a/apps/plugins/doom/d_main.c b/apps/plugins/doom/d_main.c index e7b9876bf5..b8c136689a 100644 --- a/apps/plugins/doom/d_main.c +++ b/apps/plugins/doom/d_main.c @@ -109,23 +109,25 @@ void D_DoAdvanceDemo (void); * * Called by I/O functions when an event is received. * Try event handlers for each code area in turn. - * cph - in the true spirit of the Boom source, let the - * short ciruit operator madness begin! */ void D_PostEvent(event_t *ev) { /* cph - suppress all input events at game start * FIXME: This is a lousy kludge */ - if (gametic < 3) return; - M_Responder(ev) || - (gamestate == GS_LEVEL && ( - HU_Responder(ev) || - ST_Responder(ev) || - AM_Responder(ev) - ) - ) || - G_Responder(ev); + if (gametic < 3) + return; + + if(!M_Responder(ev)) { + if(gamestate == GS_LEVEL && ( + HU_Responder(ev) || + ST_Responder(ev) || + AM_Responder(ev) + )) + return; + else + G_Responder(ev); + } } // -- cgit v1.2.3