diff options
| author | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-06-01 17:11:04 +0000 |
|---|---|---|
| committer | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-06-01 17:11:04 +0000 |
| commit | 48917b14199931161c383bf4ff30db2323e1eccb (patch) | |
| tree | c133f2dfce0169a5990f0ed6b3fbefe7178eb983 | |
| parent | 11a4b4ecd53ec83ab4c92c4896566aeebe06ccc1 (diff) | |
| download | crawl-ref-48917b14199931161c383bf4ff30db2323e1eccb.tar.gz crawl-ref-48917b14199931161c383bf4ff30db2323e1eccb.zip | |
Fix 2578980: mouseclicks in character selection screen treated as
(non-alphanumeric) characters.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/branches/stone_soup-0.5@9875 c06c8d41-db1a-0410-9941-cceddc491573
| -rw-r--r-- | crawl-ref/source/cio.cc | 2 | ||||
| -rw-r--r-- | crawl-ref/source/newgame.cc | 3 | ||||
| -rw-r--r-- | crawl-ref/source/tutorial.cc | 4 |
3 files changed, 5 insertions, 4 deletions
diff --git a/crawl-ref/source/cio.cc b/crawl-ref/source/cio.cc index 308aa3eed3..166bdb6382 100644 --- a/crawl-ref/source/cio.cc +++ b/crawl-ref/source/cio.cc @@ -613,6 +613,8 @@ int line_reader::process_key(int ch) cur = buffer + pos; cursorto(pos); break; + case CK_MOUSE_CLICK: + return (-1); default: if (isprint(ch) && length < (int) bufsz - 1) { diff --git a/crawl-ref/source/newgame.cc b/crawl-ref/source/newgame.cc index c92c7c7d41..a087f4b735 100644 --- a/crawl-ref/source/newgame.cc +++ b/crawl-ref/source/newgame.cc @@ -680,8 +680,7 @@ static unsigned char _random_potion_description() // qualifiers. } while (colour == PDC_CLEAR && nature > PDQ_VISCOUS - || desc == PDESCS(PDC_CLEAR) - || desc == PDESCQ(PDQ_GLUGGY, PDC_WHITE)); + || desc == PDESCS(PDC_CLEAR)); return static_cast<unsigned char>(desc); } diff --git a/crawl-ref/source/tutorial.cc b/crawl-ref/source/tutorial.cc index 8a219e6d29..01dc15f4c1 100644 --- a/crawl-ref/source/tutorial.cc +++ b/crawl-ref/source/tutorial.cc @@ -1889,7 +1889,7 @@ void learned_something_new(tutorial_event_type seen_what, coord_def gc) "e<w>v</w>oking it. For the latter the power depends on " "your Evocations skill."; #ifdef USE_TILE - text << "Both wielding and evoking a wielded item can be achieved " + text << " Both wielding and evoking a wielded item can be achieved " "by clicking on it with your <w>left mouse button</w>."; #endif text << "\nDuring the tutorial you can reread this information at " @@ -2436,7 +2436,7 @@ void learned_something_new(tutorial_event_type seen_what, coord_def gc) "<w>e</w>at something quickly, or you'll die. The safest " "way to deal with this is to simply eat something from your " "inventory, rather than wait for a monster to leave a corpse. " - "In a pinch potions and fountains also can provide some " + "In a pinch, potions and fountains also can provide some " "nutrition, though not as much as food."; if (Options.tutorial_type == TUT_MAGIC_CHAR) |