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, 4 insertions, 2 deletions

diff --git a/crawl-ref/source/initfile.cc b/crawl-ref/source/initfile.cc
index f73c7bd1d5..01764ac3ba 100644
--- a/crawl-ref/source/initfile.cc
+++ b/crawl-ref/source/initfile.cc
@@ -290,7 +290,7 @@ static char str_to_race( const std::string &str )
     return ((index != -1) ? index_to_letter( index - 1 ) : 0); 
 }
 
-static char str_to_class( const std::string &str )
+static int str_to_class( const std::string &str )
 {
     int index = -1;
 
@@ -702,7 +702,7 @@ void game_options::reset_options()
     // These are only used internally, and only from the commandline:
     // XXX: These need a better place.
     sc_entries             = 0;
-    sc_format              = SCORE_REGULAR;
+    sc_format              = -1;
 
     friend_brand    = CHATTR_NORMAL;
     heap_brand      = CHATTR_NORMAL;
@@ -2406,6 +2406,8 @@ bool parse_args( int argc, char **argv, bool rc_only )
                     Options.sc_format = SCORE_TERSE;
                 else if (o == CLO_VSCORES)
                     Options.sc_format = SCORE_VERBOSE;
+                else if (o == CLO_SCORES)
+                    Options.sc_format = SCORE_REGULAR;
             }
             break;