* Tweak FAQ and change log some more.

* Default use_fake_cursor to true since it appears to be a common enough
  problem that we regularly get bug reports about the cursor
  disappearing in X mode.
* Add altars to the list of features displayed in V.


git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@9585 c06c8d41-db1a-0410-9941-cceddc491573

7 files changed, 118 insertions, 99 deletions

diff --git a/crawl-ref/docs/changes.stone_soup b/crawl-ref/docs/changes.stone_soup
index a2294e83a5..095444523e 100644
--- a/crawl-ref/docs/changes.stone_soup
+++ b/crawl-ref/docs/changes.stone_soup
@@ -17,7 +17,6 @@ Breaks saves compatibility.
 * Much more convenient tiles version.
 * Zombies and skeletons can no longer use stairs.
 * Transformations meld equipment instead of removing it.
-* Arena mode for inter-monster fights.
 
 Levels
 ------
@@ -78,6 +77,7 @@ Monsters
 * Fixed summoned monsters taking non-summoned items with them.
 * Make abominations resist poison.
 * Butchered corpses sometimes leave skeletons.
+* Finally fixed monsters acting before being announced as "coming into view".
 
 Interface
 ---------
@@ -103,6 +103,7 @@ Interface
 * Ability and card descriptions are now searchable in the database ('?/').
 * Allow wishing for specific fixed and randarts in wizard mode ('o' command).
 * Add food item based hunger descriptions to spells.
+* "Glow" status now appears as soon as contamination effects become possible.
 
 Items
 -----
@@ -163,6 +164,7 @@ Miscellaneous
 * Greatly reduced ranges (both player and monster), now mostly capped by LOS.
 * For most bolts, hitting a monster reduces range by one.
 * Added arena mode to watch monsters fighting other monsters.
+* Fixed crashes involving "invisible/unmoving" monsters.
 * Crashes now leave highly informative crash dumps.
 * Poison Weapon is now a level 2 spell.
 * Extension will now also extend temporary weapon brands.
diff --git a/crawl-ref/docs/options_guide.txt b/crawl-ref/docs/options_guide.txt
index d3c11bc623..caabd13789 100644
--- a/crawl-ref/docs/options_guide.txt
+++ b/crawl-ref/docs/options_guide.txt
@@ -2005,7 +2005,7 @@ background = black
         colour other than black (such as an xterm), but this option is
         still experimental and the results may not be very good.
 
-use_fake_cursor = false
+use_fake_cursor = true
         If true, Crawl draws the cursor explicitly on the level-map and
         targeting screens instead of relying on the term to draw the
         cursor. Use this if your term cannot show a cursor over
diff --git a/crawl-ref/settings/init.txt b/crawl-ref/settings/init.txt
index 02737c06dc..1a2856ec45 100644
--- a/crawl-ref/settings/init.txt
+++ b/crawl-ref/settings/init.txt
@@ -401,4 +401,4 @@ note_monsters = orb of fire, ancient lich, Sigmund
 
 ##### 6-c   Unix ##################################
 #
-# use_fake_cursor = true
+# use_fake_cursor = false
diff --git a/crawl-ref/source/command.cc b/crawl-ref/source/command.cc
index 6014528aae..c9095db5dd 100644
--- a/crawl-ref/source/command.cc
+++ b/crawl-ref/source/command.cc
@@ -1480,7 +1480,7 @@ static bool _handle_FAQ()
                 answer = "No answer found in the FAQ! Please submit a "
                          "bug report!";
             }
-            answer = "Q: " + getFAQ_Question(key) + EOL + "A: " + answer;
+            answer = "Q: " + getFAQ_Question(key) + EOL + answer;
             linebreak_string2(answer, width - 1);
             print_description(answer);
             if (getch() == 0)
diff --git a/crawl-ref/source/dat/database/FAQ.txt b/crawl-ref/source/dat/database/FAQ.txt
index 10f64f2b50..25283ebfc3 100644
--- a/crawl-ref/source/dat/database/FAQ.txt
+++ b/crawl-ref/source/dat/database/FAQ.txt
@@ -28,7 +28,7 @@ What exactly is the goal of this game?
 %%%%
 A:goal
 
-To survive and to win, obviously. For this you need to find the fabled
+A: To survive and to win, obviously. For this you need to find the fabled
 Orb of Zot deep down in the dungeon and bring it back to the surface.
 To enter the realm of Zot, you'll first need to collect three runes to be
 found in various branches of the dungeon.
@@ -44,9 +44,9 @@ How can I drop/pick up only part of a stack?
 %%%%
 A:drop
 
-Press 'd' (or ','/'g'), followed by a number (the amount), and finally the
-item's letter. For pickup, this is only possible when choosing items from
-a menu, i.e. ',,' or 'gg'.
+A: Press 'd' (or ','/'g'), followed by a number (the amount), and finally
+the item's letter. For pickup, this is only possible when choosing items
+from a menu, i.e. ',,' or 'gg'.
 Stacks that are selected only in part are marked with '#' rather than '+'.
 %%%%
 Q:downstairs
@@ -55,15 +55,15 @@ I can't find any downstairs. Am I missing something?
 %%%%
 A:downstairs
 
-While this might be a bug, chances are the downstairs are somewhere in a
-room closed off by a secret door. If you search (with '5') in suspicious
+A: While this might be a bug, chances are the downstairs are somewhere in
+a room closed off by a secret door. If you search (with '5') in suspicious
 looking corridors and along walls near empty terrain, you will eventually
 find one. Note that most level feature three downstairs as well as three
 upstairs, not counting any escape hatches. If you get stuck, you might
 try another stairs from the level above.
-Alternatively, if you are in one of the branches, you might also have 
+Alternatively, if you are in one of the branches, you might also have
 reached its lowest level and have to turn around to explore another one.
-Check the database ("?/b") for the number of levels per branch.
+Check the database ('?/b') for the number of levels per branch.
 %%%%
 Q:stuck
 
@@ -71,10 +71,10 @@ I teleported and ended up in a closed room without any exits. Am I stuck?
 %%%%
 A:stuck
 
-Hopefully not. Search all the walls with '5' in case there's a secret door.
-If you really can't find any, it could be a bug and need fixing, so please
-report it on our SourceForge tracker. In the meantime, you can try to escape
-with digging, disintegration or teleportation.
+A: Hopefully not. Search all the walls with '5' in case there's a secret
+door. If you really can't find any, it could be a bug and need fixing, so
+please report it on our SourceForge tracker. In the meantime, you can try
+to escape with digging, disintegration or teleportation.
 %%%%
 Q:survival
 
@@ -82,13 +82,13 @@ How can I avoid dying all the time? Can you give me some playing tips?
 %%%%
 A:survival
 
-If you've got trouble even reaching the Temple, you might want to try out
-the Tutorial for some general playing hints. (To do this, press 'T' in the
-character selection menu.) Also, there are easy playing combinations and
-more challenging ones (marked in dark grey on the selection screen). If you
-are new to Crawl, sticking to the easier ones is advisable. In general,
-treat each new monster you meet with utmost caution and keep an eye on your
-hit points and magic.
+A: If you've got trouble even reaching the Temple, you might want to try
+out the Tutorial for some general playing hints. (To do this, press 'T' in
+the character selection menu.) Also, there are easy playing combinations
+and more challenging ones (marked in dark grey on the selection screen).
+If you are new to Crawl, sticking to the easier ones is advisable. In
+general, treat each new monster you meet with utmost caution and keep an
+eye on your hit points and magic.
 
 For specific hints dealing with a particular character, you can press '#'
 in-game to create a "dump" in your morgue folder that you can then post on
@@ -105,11 +105,11 @@ Is there a cheating mode to Crawl where I can play without dying?
 %%%%
 A:cheating
 
-Not a cheating mode, exactly, but if your build supports it you can play in
-wizard mode (access with '&') where you are prompted whenever you're about
-to die, and have access to a number of nifty commands to create equipment,
-travel to distant branches, or fiddle with your stats or skills. Note that
-wizard mode games will never appear on the highscore list.
+A: Not a cheating mode, exactly, but if your build supports it you can play
+in wizard mode (access with '&') where you are prompted whenever you're
+about to die, and have access to a number of nifty commands to create
+equipment, travel to distant branches, or fiddle with your stats or skills.
+Note that wizard mode games will never appear on the highscore list.
 
 Many players reckon long-time use of wizard mode to be detrimental to your
 playing skills. On the other hand, wizard mode has its uses: we are really
@@ -122,7 +122,7 @@ I've got two cool weapons. How can I tell which one is better?
 %%%%
 A:weapons
 
-"Better" depends on a number of factors, such as your weapon skills,
+A: "Better" depends on a number of factors, such as your weapon skills,
 whether it's one or two-handed, the randart properties, the weapon brand,
 and the monsters you're about to face. In general, switching from a weapon
 type you are already highly skilled with to another one that you have no
@@ -137,7 +137,7 @@ Which gods would you recommend to a beginning player?
 %%%%
 A:religion
 
-The easiest gods to play are probably Trog (for pure fighters), Sif Muna
+A: The easiest gods to play are probably Trog (for pure fighters), Sif Muna
 (for spellcasters), Beogh (for orcs) and Xom (for general fun).
 When you reach the Temple for the first time be sure to read all gods'
 descriptions and take your time in deciding which way to go.
@@ -148,15 +148,16 @@ My characters keep starving. What am I doing wrong?
 %%%%
 A:starving
 
-It's possible that you simply spend too much time on cleared levels where
-not enough monsters are generated to dine on. You might also be too choosy
-about what you eat: unless you are herbivorous you will have to occasionally
-eat monster chunks, even those that sometimes make you sick (coloured brown
-in the menu and the prompt). If you worship a god who enjoys sacrifices pay
-attention to your own hunger status and wait until the end of prayer before
-chopping a corpse if need be. Also, casting (difficult) spells will make you
-hungry, but high Intelligence and Spellcasting will lessen this effect. If
-you press "II", you can read about the hunger effects of your spells.
+A: It's possible that you simply spend too much time on cleared levels
+where not enough monsters are generated to dine on. You might also be too
+choosy about what you eat: unless you are herbivorous you will have to
+occasionally eat monster chunks, even those that sometimes make you sick
+(coloured brown in the menu and the prompt). If you worship a god who
+enjoys sacrifices pay attention to your own hunger status and wait until
+the end of prayer before chopping a corpse if need be.
+Also, casting (difficult) spells will make you hungry, but high
+Intelligence and Spellcasting will lessen this effect. If you press 'II',
+you can read about the hunger effects of your spells.
 %%%%
 Q:ghosts
 
@@ -164,7 +165,7 @@ I keep getting murdered by my own ghosts. Can I deactivate them?
 %%%%
 A:ghosts
 
-No, you can't. On the plus side, once a ghost has been loaded onto a
+A: No, you can't. On the plus side, once a ghost has been loaded onto a
 level, it won't be loaded again - unless you happen to die on that level.
 Keep in mind that you don't absolutely have to fight every monster you meet,
 and with ghosts it's even easier: they cannot leave the level they were
@@ -180,7 +181,7 @@ I've somehow ended up in a place called "Abyss". How do I get out of here?
 %%%%
 A:abyss
 
-If you are in the Abyss for the first time, chances of getting out are
+A: If you are in the Abyss for the first time, chances of getting out are
 slim. Still, here are a few general hints:
 * You need to find a gateway leading out of the Abyss. These are rare!
 * Don't stick around to fight, move as much as possible!
@@ -192,12 +193,12 @@ slim. Still, here are a few general hints:
 %%%%
 Q:randart
 
-What do the terms "randart", "fixedart" and "egotitem" signify? 
+What do the terms "randart", "fixedart" and "egoitem" signify?
 %%%%
 A:randart
 
-Apart from the standard items you'll find lying around in the dungeon, you
-might also stumble upon artefacts which come in three varieties:
+A: Apart from the standard items you'll find lying around in the dungeon,
+you might also stumble upon artefacts which come in three varieties:
 
 * randart: a random artefact, usually a weapon or type of armour with
   random properties such as conferring resistances or abilities
@@ -208,14 +209,13 @@ might also stumble upon artefacts which come in three varieties:
   instead has unique hardcoded effects and descriptions.
 
 None of the three types can be enchanted or branded, neither temporarily nor
-permanently. There is another type of special item that pops up a bit more 
+permanently. There is another type of special item that pops up a bit more
 often:
 
 * egoitem: these are ordinary items with one special property. For example,
   a short sword of venom, a cap of see invisible or boots of running. These
   can be affected by enchanting scrolls and also by corrision and acids.
   Weapons of this type are branded, so you cannot brand them in other ways.
-
 %%%%
 Q:oklobs
 
@@ -223,7 +223,7 @@ Oklob plants suck! Are you planning to remove them at last?
 %%%%
 A:oklobs
 
-No. We think that Oklob plants provide an interesting challenge.
+A: No. We think that Oklob plants provide an interesting challenge.
 Resist the urge to kill them at once. If you absolutely need to bypass them
 use your resources wisely. A hint: They cannot see invisible.
 %%%%
@@ -233,7 +233,7 @@ I went down these stairs and got killed instantly! Is this a bug?
 %%%%
 A:instadeath
 
-Probably not. While your death might be due to an ill-placed vault (this
+A: Probably not. While your death might be due to an ill-placed vault (this
 would be a bug), it is generally just really bad luck. We believe that a
 game is more fun if the risk of death is real. This means that such instant
 deaths cannot be fully avoided as Crawl relies on randomness for posing
@@ -246,11 +246,11 @@ My zombies refuse to follow me into the next level. Is this a bug?
 %%%%
 A:zombified
 
-No, it's a deliberate design decision. As of version 0.5, zombies,
+A: No, it's a deliberate design decision. As of version 0.5, zombies,
 skeletons and simulacra are considered too stupid to manoeuvre along
 staircases. We realize that this weakens Necromancers but we consider the
 interface improvement of zombie herding becoming unfeasible to be more
-important. Interestingly, this makes Necromancy and Yredelelmnul more fun
+important. Interestingly, this makes Necromancy and Yredelemnul more fun
 than before.
 
 Keep in mind that the same also applies to hostile undead of the same kind!
@@ -264,14 +264,15 @@ The game keeps crashing. / I think I found a bug. What do I do?
 %%%%
 A:bug
 
-Please submit a bug report on SourceForge, and give as much information as
-you can. (What were you doing at the time? What did you expect to happen,
-what happened instead? etc.) Most importantly, what version are you playing?
-Sometimes a screenshot can be helpful. For crashes or monsters/items/levels
-behaving oddly, we probably need a save file. To be on the safe side, attach
-the entire zipped save of the character in question. If there are error
-messages, please write them down. Short of a save file, a guide on how to
-reproduce the crash (or bug) can be useful; you can use wizard mode for this.
+A: Please submit a bug report on SourceForge, and give as much information
+as you can. (What were you doing at the time? What did you expect to
+happen, what happened instead? etc.) Most importantly, what version are you
+playing? Sometimes a screenshot can be helpful. For crashes or
+monsters/items/levels behaving oddly, we probably need a save file. To be
+on the safe side, attach the entire zipped save of the character in
+question. If there are error messages, please write them down. Short of a
+save file, a guide on how to reproduce the crash (or bug) can be useful;
+you can use wizard mode for this.
 
 If you don't log in to SourceForge or leave an email address at least check
 the thread from time to time in case we have some more questions. In any case
@@ -285,7 +286,7 @@ I've got millions of ideas! Can I join the team?
 %%%%
 A:ideas
 
-No, you can't. At least not on ideas alone.
+A: No, you can't. At least not on ideas alone.
 
 All of the devteam members submitted a number of code intensive patches
 and/or took over responsibility over an important side project before
@@ -307,11 +308,11 @@ Hey! Why did you close my feature request?
 %%%%
 A:feature
 
-If you are logged in to SourceForge when submitting your feature request,
-or choose to "Monitor" the resulting thread while logged in, you will get
-an email any time someone replies to (or fiddles with) this thread. Once a
-thread has been closed, you can still access it by searching for requests
-with the "Closed" status.
+A: If you are logged in to SourceForge when submitting your feature
+request, or choose to "Monitor" the resulting thread while logged in, you
+will get an email any time someone replies to (or fiddles with) this
+thread. Once a thread has been closed, you can still access it by searching
+for requests with the "Closed" status.
 
 We always try to give a reason for closing a request, but it usually boils
 down to three reasons:
@@ -331,13 +332,14 @@ I've written a patch for a cool new feature! Where should I send it?
 %%%%
 A:patch
 
-Please submit it to the Patches tracker on SourceForge. Keep in mind that
-without previous discussions, we may not be able to use the patch, or it
-might need heavy modification. In general, it is safer to first file your
-suggestions under Feature Requests and wait for people to become
+A: Please submit it to the Patches tracker on SourceForge. Keep in mind
+that without previous discussions, we may not be able to use the patch, or
+it might need heavy modification. In general, it is safer to first file
+your suggestions under Feature Requests and wait for people to become
 enthusiastic and give feedback before you submit a patch. If you want,
 you can also write a patch that implements an existing FR or fixes a bug.
-We appreciate your help!
+
+We really appreciate your help!
 %%%%
 Q:help
 
@@ -345,8 +347,8 @@ I cannot code, but I'd really like to help improve the game. What can I do?
 %%%%
 A:help
 
-There are several areas where you can get creative and outside help is much
-appreciated. These are:
+A: There are several areas where you can get creative and outside help is
+much appreciated. These are:
 * the maps/vaults (see dat/ folder, docs/level_design.txt)
 * monster speech (see dat/database/, docs/monster_speech.txt)
 * monster/item/spell descriptions (see dat/descript/)
@@ -365,15 +367,15 @@ Is there a way for me to play the new version before it is released?
 %%%%
 A:beta
 
-There certainly is! You can play "trunk" (what will eventually become the
-next version) online on http://crawl.develz.org, or you can download Windows
-binaries from the same site. Note that trunk may be buggy, and that many
-changes will invalidate your saved games. If that doesn't bother you, go
-ahead and play!
+A: There certainly is! You can play "trunk" (what will eventually become
+the next version) online on http://crawl.develz.org, or you can download
+Windows binaries from the same site. Note that trunk may be buggy, and that
+many changes will invalidate your saved games. If that doesn't bother you,
+go ahead and play!
 Be sure to leave some feedback/suggestions/bug reports on the SourceForge
-trackers. When doing so please mention the version (r????) you're currently
-playing in case the bug's already been fixed or the feature already
-implemented.
+trackers. When doing so please mention the version (r????) you're
+currently playing in case the bug's already been fixed or the feature
+already implemented.
 %%%%
 Q:interact
 
@@ -381,7 +383,7 @@ Is there a way for me to interact with other players?
 %%%%
 A:interact
 
-If you play online on http://crawl.akrasiac.org or http://crawl.develz.org
+A: If you play online on http://crawl.akrasiac.org or http://crawl.develz.org
 you can watch games in progress, other players can watch you while you play,
 and you can kill other players' ghosts. You can even send and receive
 messages.
@@ -390,6 +392,16 @@ Check docs/ssh_guide.txt for an explanation about how to play online. You can
 also chat in the Crawl channel (irc.freenode.net, ##crawl), or discuss in the
 Something Awful forum or the rec.games.roguelike.misc newsgroup.
 %%%%
+Q:changes
+
+What did you change in the most recent version?
+%%%%
+A:changes
+
+A: The (admittedly highly subjective) highlights of the release are listed
+along with the version information under '?v'. For more details, check out
+the change log in docs/changes.stone_soup.
+%%%%
 ##############################################
 # Questions about the Tiles version
 ##############################################
@@ -399,10 +411,11 @@ Can I play Tiles online?
 %%%%
 A:tiles online
 
-Sadly, no, that's not possible at the moment. We do hope that one day this
-will be different, but so far we haven't even decided how to go about it,
-and it's still far off. If you can, do give the console version a try:
-playing online is certainly worth it.
+A: Sadly, no, that's not possible at the moment. We are planning to change
+that but so far we haven't even decided how to go about it, and so it's
+still far off.
+If you can, do give the console version a try: playing online is certainly
+worth it.
 %%%%
 Q:tiles graphics
 
@@ -410,22 +423,24 @@ Is there a way for me to replace some of the tiles with different ones?
 %%%%
 A:tiles graphics
 
-It depends. If all you want are minor modifications such as colour changes
-you can directly modify the png files in the dat/tiles/ folder.
+A: It depends. If all you want are minor modifications such as colour
+changes you can directly modify the png files in the dat/tiles/ folder.
 
 Otherwise, you'll need to be able to compile the game. In this case you can
-either directly replace the tiles in the rltiles/ subfolders, or change their
-paths in the dc-xxxx.txt files. For the compilation to be successful, you may
-also need to delete or rename the *.png files in rltiles/. Upon compilation,
-the newly rolled *.png files are copied into the dat/tiles/ folder which is
-where the game accesses the tiles it needs. You can then share these files
-with other players, so they can use your tileset without having to compile
-the game.
+either directly replace the tiles in the rltiles/ subfolders, or change
+their paths in the dc-xxxx.txt files. For the compilation to be successful,
+you may also need to delete or rename the *.png files in rltiles/. Upon
+compilation, the newly rolled *.png files are copied into the dat/tiles/
+folder which is where the game accesses the tiles it needs. You can then
+share these files with other players, so they can use your tileset without
+having to compile the game.
 
 If you've created some nice new tiles or variations of existing ones you'd
 like to share you might want to send them over the mailing list or submit
 them as a SourceForge item. It's easiest for us if they are already in
-32x32 png format, preferrably zipped if there are several. Thanks in advance!
+32x32 png format, preferrably zipped if there are several.
+
+Thanks in advance!
 %%%%
 Q:tiles options
 
@@ -433,6 +448,6 @@ Is there a way to modify the size of the tiles screen, the font etc?
 %%%%
 A:tiles options
 
-Yes. Play around with the options in settings/tiles_options.txt until
-you're satisfied.
+A: Yes. Play around with the options in settings/tiles_options.txt until
+you are satisfied.
 %%%%
diff --git a/crawl-ref/source/directn.cc b/crawl-ref/source/directn.cc
index f79df0c226..92a7fc3845 100644
--- a/crawl-ref/source/directn.cc
+++ b/crawl-ref/source/directn.cc
@@ -462,8 +462,11 @@ void full_describe_view()
     // Grab all items known (or thought) to be in the stashes in view.
     for (radius_iterator ri(you.pos(), LOS_RADIUS); ri; ++ri)
     {
-        if (grid_stair_direction(grd(*ri)) != CMD_NO_CMD)
+        if (grid_stair_direction(grd(*ri)) != CMD_NO_CMD
+            || is_altar(grd(*ri)))
+        {
             list_features.push_back(*ri);
+        }
 
         const monsters *mon = monster_at(*ri);
         const bool unknown_mimic = (mon && mons_is_unknown_mimic(mon));
@@ -668,7 +671,6 @@ void full_describe_view()
             const coord_def c = list_features[i];
             std::string desc = "";
 #ifndef USE_TILE
-//            get_screen_glyph(c)
             const coord_def e  = c - you.pos() + coord_def(9,9);
             unsigned short col = env.show_col(e);;
             int object         = env.show(e);
diff --git a/crawl-ref/source/initfile.cc b/crawl-ref/source/initfile.cc
index dc2ce6daaa..18ecf0fce0 100644
--- a/crawl-ref/source/initfile.cc
+++ b/crawl-ref/source/initfile.cc
@@ -809,7 +809,7 @@ void game_options::reset_options()
 
     // 10 was the cursor step default on Linux.
     level_map_cursor_step  = 7;
-    use_fake_cursor        = false;
+    use_fake_cursor        = true;
 
     stash_tracking         = STM_ALL;