summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/windowmanager-sdl.cc
diff options
context:
space:
mode:
authorBrendan Hickey <brendan@bhickey.net>2013-04-28 23:26:25 -0700
committerBrendan Hickey <brendan@bhickey.net>2013-04-28 23:54:23 -0700
commit23222fdd521c999d61b2cbdee7fe4d87a234cf8c (patch)
treeb23dd3877fd266625ceb389873a9bd94d7379951 /crawl-ref/source/windowmanager-sdl.cc
parent926959ac5bd809f4014e5ad2f47bbe778e5760e8 (diff)
downloadcrawl-ref-23222fdd521c999d61b2cbdee7fe4d87a234cf8c.tar.gz
crawl-ref-23222fdd521c999d61b2cbdee7fe4d87a234cf8c.zip
Refactor ASSERT(a && b) -> ASSERT(a); ASSERT(b);
Convert conjunctive assertions into separate assertions. This ought to be correctness preserving. I ran the stress tests and didn't notice anything unusual. While I have confidence in it, if you are the slightest bit suspicious of this, please roll it back. Found instances with `ASSERT(\([^(|]*\) && \([^)|]*\))` Manually inspected each instance.
Diffstat (limited to 'crawl-ref/source/windowmanager-sdl.cc')
-rw-r--r--crawl-ref/source/windowmanager-sdl.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/crawl-ref/source/windowmanager-sdl.cc b/crawl-ref/source/windowmanager-sdl.cc
index 3811a663a2..7e2ab7ef23 100644
--- a/crawl-ref/source/windowmanager-sdl.cc
+++ b/crawl-ref/source/windowmanager-sdl.cc
@@ -163,7 +163,8 @@ static int _translate_keysym(SDL_keysym &keysym)
case SDLK_POWER:
case SDLK_EURO:
case SDLK_UNDO:
- ASSERT(keysym.sym >= SDLK_F1 && keysym.sym <= SDLK_UNDO);
+ ASSERT(keysym.sym >= SDLK_F1);
+ ASSERT(keysym.sym <= SDLK_UNDO);
return -(keysym.sym + (SDLK_UNDO - SDLK_F1 + 1) * mod);
// Hack. libw32c overloads clear with '5' too.