diff options
author | Daniel Stenberg <daniel@haxx.se> | 2006-08-16 13:31:40 +0000 |
---|---|---|
committer | Daniel Stenberg <daniel@haxx.se> | 2006-08-16 13:31:40 +0000 |
commit | 871be001f76e91bc8f632318748276119f3348a2 (patch) | |
tree | 482f802cdb2ca0a4f4583170b7372d895e59cc78 /apps | |
parent | f52e03f93c489f9ca0c86849f854fbb396385cd2 (diff) | |
download | rockbox-871be001f76e91bc8f632318748276119f3348a2.tar.gz rockbox-871be001f76e91bc8f632318748276119f3348a2.zip |
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
Diffstat (limited to 'apps')
-rw-r--r-- | apps/plugins/doom/d_main.c | 24 |
1 files changed, 13 insertions, 11 deletions
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); | |||
109 | * | 109 | * |
110 | * Called by I/O functions when an event is received. | 110 | * Called by I/O functions when an event is received. |
111 | * Try event handlers for each code area in turn. | 111 | * Try event handlers for each code area in turn. |
112 | * cph - in the true spirit of the Boom source, let the | ||
113 | * short ciruit operator madness begin! | ||
114 | */ | 112 | */ |
115 | 113 | ||
116 | void D_PostEvent(event_t *ev) | 114 | void D_PostEvent(event_t *ev) |
117 | { | 115 | { |
118 | /* cph - suppress all input events at game start | 116 | /* cph - suppress all input events at game start |
119 | * FIXME: This is a lousy kludge */ | 117 | * FIXME: This is a lousy kludge */ |
120 | if (gametic < 3) return; | 118 | if (gametic < 3) |
121 | M_Responder(ev) || | 119 | return; |
122 | (gamestate == GS_LEVEL && ( | 120 | |
123 | HU_Responder(ev) || | 121 | if(!M_Responder(ev)) { |
124 | ST_Responder(ev) || | 122 | if(gamestate == GS_LEVEL && ( |
125 | AM_Responder(ev) | 123 | HU_Responder(ev) || |
126 | ) | 124 | ST_Responder(ev) || |
127 | ) || | 125 | AM_Responder(ev) |
128 | G_Responder(ev); | 126 | )) |
127 | return; | ||
128 | else | ||
129 | G_Responder(ev); | ||
130 | } | ||
129 | } | 131 | } |
130 | 132 | ||
131 | // | 133 | // |