Remove the BUILD_REVISION define which was apparently never used, and

directly use svn_revision in the version output. Also add 0.5 version
highlights, while I was at it.


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

5 files changed, 23 insertions, 9 deletions

diff --git a/crawl-ref/docs/changes.stone_soup b/crawl-ref/docs/changes.stone_soup
index 90e6402c42..d964f43c75 100644
--- a/crawl-ref/docs/changes.stone_soup
+++ b/crawl-ref/docs/changes.stone_soup
@@ -5,6 +5,15 @@ Disclaimer: The code and this list are very much a work in progress.
 
 Breaks saves compatibility.
 
+
+0.5 Highlights
+--------------
+* Several great new portal vaults.
+* Cooler labyrinths.
+* Several new uniques and other monsters. 
+* Artefact spellbooks.
+* Much more convenient tiles version.
+
 Levels
 ------
 * New portal vaults (Sewer, Ice Cave, Minitomb), and many new vaults.
diff --git a/crawl-ref/source/acr.cc b/crawl-ref/source/acr.cc
index a285f6a0ee..70fe2f2155 100644
--- a/crawl-ref/source/acr.cc
+++ b/crawl-ref/source/acr.cc
@@ -312,6 +312,9 @@ static void _show_commandline_options_help()
     puts("  -tscores [N]           terse highscore list");
     puts("  -vscores [N]           verbose highscore list");
     puts("  -scorefile <filename>  scorefile to report on");
+    puts("");
+    puts("Arena options: (Stage a tournament between various monsters.)");
+    puts("  -arena \"<monster list> v <monster list> arena:<arena map>\"");
 }
 
 static void _wanderer_startup_message()
diff --git a/crawl-ref/source/command.cc b/crawl-ref/source/command.cc
index 6d7e20a894..3b9755018f 100644
--- a/crawl-ref/source/command.cc
+++ b/crawl-ref/source/command.cc
@@ -99,7 +99,12 @@ static const char *features[] = {
 static std::string _get_version_information(void)
 {
     std::string result  = "This is <w>";
-                result += CRAWL " " VERSION "</w> (" VERSION_DETAIL ").";
+                result += CRAWL " " VERSION "</w> (";
+#ifdef BUILD_REVISION
+                result += "r" + number_to_string(svn_revision()) + ", ";
+#endif
+                result += VERSION_DETAIL ").";
+
     result += "\n\n";
 
     return (result);
diff --git a/crawl-ref/source/mon-data.h b/crawl-ref/source/mon-data.h
index d64e1579d9..36ae188771 100644
--- a/crawl-ref/source/mon-data.h
+++ b/crawl-ref/source/mon-data.h
@@ -4081,7 +4081,7 @@ static monsterentry mondata[] = {
 {
     // Roxanne obviously can't use items, but we want to equip her with
     // a spellbook, so MONUSE_STARTING_EQUIPMENT is necessary.
-    MONS_ROXANNE, '8', LIGHTGREEN, "Roxanne",
+    MONS_ROXANNE, '8', BLUE, "Roxanne",
     M_UNIQUE | M_SPELLCASTER | M_ACTUAL_SPELLS | M_STATIONARY | M_SPEAKS,
     mrd(MR_RES_POISON | MR_RES_FIRE | MR_RES_COLD | MR_RES_ELEC, 2),
     0, 10, MONS_CLAY_GOLEM, MONS_ROXANNE, MH_NONLIVING, MAG_IMMUNE,
diff --git a/crawl-ref/source/version.h b/crawl-ref/source/version.h
index 56eb78ed42..eec4da025c 100644
--- a/crawl-ref/source/version.h
+++ b/crawl-ref/source/version.h
@@ -35,6 +35,9 @@
 #define VER_NUM  "0.5"
 #define VER_QUAL "-svn"
 
+// Undefine for official releases.
+#define BUILD_REVISION
+
 // last updated 07august2001 {mv}
 /* ***********************************************************************
  * called from: chardump - command - newgame
@@ -45,13 +48,7 @@
 /* ***********************************************************************
  * called from: command
  * *********************************************************************** */
-#define BUILD_DATE __DATE__
-
-#ifdef BUILD_REVISION
-#define VERSION_DETAIL "r" BUILD_REVISION "/" BUILD_DATE
-#else
-#define VERSION_DETAIL BUILD_DATE
-#endif
+#define VERSION_DETAIL __DATE__
 
 // Returns the largest SVN revision number that a source file has been updated
 // to.  This is not perfectly accurate, but should be good enough for save