summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/cio.cc
diff options
context:
space:
mode:
authorj-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573>2009-06-21 21:25:58 +0000
committerj-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573>2009-06-21 21:25:58 +0000
commit53b94b89c7037837eb6bf00ea8b71d9f92963f35 (patch)
treebde5ccd8d4071e4aa3b87d1b5c26bdd903e59f1a /crawl-ref/source/cio.cc
parent43b1796995f29d920d306860969c751e4bb26640 (diff)
downloadcrawl-ref-53b94b89c7037837eb6bf00ea8b71d9f92963f35.tar.gz
crawl-ref-53b94b89c7037837eb6bf00ea8b71d9f92963f35.zip
Apply commits r10013 and 10014 to trunk.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@10015 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/cio.cc')
-rw-r--r--crawl-ref/source/cio.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/crawl-ref/source/cio.cc b/crawl-ref/source/cio.cc
index d5c87f7e0a..f657204f88 100644
--- a/crawl-ref/source/cio.cc
+++ b/crawl-ref/source/cio.cc
@@ -415,7 +415,7 @@ int line_reader::read_line(bool clear_previous)
if (history)
history->go_end();
- for ( ; ; )
+ while (true)
{
int ch = getchm(c_getch);
@@ -514,8 +514,8 @@ int line_reader::process_key(int ch)
if (!history)
break;
- const std::string *text =
- ch == CK_UP ? history->prev() : history->next();
+ const std::string *text = (ch == CK_UP) ? history->prev()
+ : history->next();
if (text)
{