New key=value logfile format as proposed by Shawn Moore. This is more verbose

than the old format by about 2x, but is more maintainable and comprehensible.

Removed support for parsing scorefiles/logfiles older than 4.0 beta 26.

Added shim to make 0.1.7 logfiles compatible with 0.2

Using the -scorefile option alone (no -scores, -tscores, etc.) causes Crawl to
read in the existing scorefile/logfile and write it out to stdout in the new
format.

Ghouls get claw damage messages in unarmed combat.

Plain oozes lose acid damage attacks (added inadvertently).

Prompt the user when trying to displace a friendly over water (the old
fix was to simply say "The foo resists").

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

1 files changed, 6 insertions, 5 deletions

diff --git a/crawl-ref/source/misc.cc b/crawl-ref/source/misc.cc
index 2aa2d363cb..94542fff02 100644
--- a/crawl-ref/source/misc.cc
+++ b/crawl-ref/source/misc.cc
@@ -1574,7 +1574,8 @@ bool fall_into_a_pool( int entry_x, int entry_y, bool allow_shift,
         {
             // back out the way we came in, if possible
             if (grid_distance( you.x_pos, you.y_pos, entry_x, entry_y ) == 1
-                && (entry_x != empty[0] || entry_y != empty[1]))
+                && (entry_x != empty[0] || entry_y != empty[1])
+                && mgrd[entry_x][entry_y] == NON_MONSTER)
             {
                 escape = true;
                 empty[0] = entry_x;
@@ -1991,13 +1992,13 @@ unsigned short get_packed_place()
 bool single_level_branch( int branch )
 {
     return
-        branch == BRANCH_VESTIBULE_OF_HELL ||
-        branch == BRANCH_HALL_OF_BLADES ||
-        branch == BRANCH_ECUMENICAL_TEMPLE;
+        branch >= 0 && branch < NUM_BRANCHES
+        && branches[branch].depth == 1;
 }
 
 std::string place_name( unsigned short place, bool long_name,
-                        bool include_number ) {
+                        bool include_number )
+{
 
     unsigned char branch = (unsigned char) ((place >> 8) & 0xFF);
     int lev = place & 0xFF;