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, 25 insertions, 14 deletions

diff --git a/crawl-ref/source/AppHdr.h b/crawl-ref/source/AppHdr.h
index f68fdd97c7..45849093a7 100644
--- a/crawl-ref/source/AppHdr.h
+++ b/crawl-ref/source/AppHdr.h
@@ -84,20 +84,6 @@
     //
     // #define DGAMELAUNCH
 
-    // DGL_CLEAR_SCREEN specifies the escape sequence to use to clear
-    // the screen (used only when DGAMELAUNCH is defined). We make no
-    // attempt to discover an appropriate escape sequence for the
-    // term, assuming that dgamelaunch admins can adjust this as
-    // needed.
-    //
-    // Why this is necessary: dgamelaunch's ttyplay initialises
-    // playback by jumping to the last screen clear and playing back
-    // from there. For that to work, ttyplay must be able to recognise
-    // the clear screen sequence, and ncurses clear()+refresh()
-    // doesn't do the trick.
-    //
-    #define DGL_CLEAR_SCREEN "\033[2J"
-
     #define MULTIUSER
     #define USE_UNIX_SIGNALS
 
@@ -199,6 +185,31 @@
     #error Missing platform #define or unsupported compiler.
 #endif
 
+// =========================================================================
+//  Defines for dgamelaunch-specific things.
+// =========================================================================
+
+#ifdef DGAMELAUNCH
+    // DGL_CLEAR_SCREEN specifies the escape sequence to use to clear
+    // the screen (used only when DGAMELAUNCH is defined). We make no
+    // attempt to discover an appropriate escape sequence for the
+    // term, assuming that dgamelaunch admins can adjust this as
+    // needed.
+    //
+    // Why this is necessary: dgamelaunch's ttyplay initialises
+    // playback by jumping to the last screen clear and playing back
+    // from there. For that to work, ttyplay must be able to recognise
+    // the clear screen sequence, and ncurses clear()+refresh()
+    // doesn't do the trick.
+    //
+    #define DGL_CLEAR_SCREEN "\033[2J"
+
+    // If defined, the hiscores code dumps preformatted verbose and terse
+    // death message strings in the logfile for the convenience of logfile
+    // parsers.
+    #define DGL_EXTENDED_LOGFILES
+
+#endif
 
 // =========================================================================
 //  Debugging Defines