From bf1ccbad46e68e9bebe41916a669acc1699ccf48 Mon Sep 17 00:00:00 2001
From: dshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573>
Date: Fri, 18 May 2007 07:32:35 +0000
Subject: Tweaked version.h and command.cc to add revision info for Windows svn
 builds.

Ice beasts get AT_HIT instead of AT_CLAW (to correspond to Ice Form).

Yaks and death yaks get AT_BUTT instead of AT_HIT. Maybe we should add AT_GORE,
AT_KICK, and AT_TRAMPLE too. :-)

git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@1482 c06c8d41-db1a-0410-9941-cceddc491573
---
 crawl-ref/source/command.cc | 2 +-
 crawl-ref/source/mon-data.h | 6 +++---
 crawl-ref/source/version.h  | 6 ++++++
 3 files changed, 10 insertions(+), 4 deletions(-)

(limited to 'crawl-ref/source')

diff --git a/crawl-ref/source/command.cc b/crawl-ref/source/command.cc
index 0d882bc3cf..16cfd3be7a 100644
--- a/crawl-ref/source/command.cc
+++ b/crawl-ref/source/command.cc
@@ -73,7 +73,7 @@ static const char *features[] = {
 
 void version(void)
 {
-    mpr( "This is " CRAWL " " VERSION " (" BUILD_DATE ")." );
+    mpr( "This is " CRAWL " " VERSION " (" VERSION_DETAIL ")." );
     
     std::string feats = "Features: ";
     for (int i = 1, size = sizeof features / sizeof *features; i < size; ++i)
diff --git a/crawl-ref/source/mon-data.h b/crawl-ref/source/mon-data.h
index 9daa43e878..7b8fa9c398 100644
--- a/crawl-ref/source/mon-data.h
+++ b/crawl-ref/source/mon-data.h
@@ -546,7 +546,7 @@
     M_NO_FLAGS,
     MR_RES_POISON | MR_RES_ASPHYX | MR_VUL_FIRE | MR_RES_COLD,
     0, 12, MONS_ICE_BEAST, MONS_ICE_BEAST, MH_NATURAL, -3,
-    { {AT_CLAW, AF_COLD, 5}, {AT_NONE, AF_PLAIN, 0}, {AT_NONE, AF_PLAIN, 0}, {AT_NONE, AF_PLAIN, 0} },
+    { {AT_HIT, AF_COLD, 5}, {AT_NONE, AF_PLAIN, 0}, {AT_NONE, AF_PLAIN, 0}, {AT_NONE, AF_PLAIN, 0} },
     { 5, 3, 5, 0 },
     5, 10, 10, 7, MST_NO_SPELLS, CE_NOCORPSE, Z_NOZOMBIE, S_SILENT, I_ANIMAL_LIKE, 
     MONUSE_NOTHING, SIZE_LARGE
@@ -739,7 +739,7 @@
     M_WARM_BLOOD,
     MR_NO_FLAGS,
     1200, 10, MONS_YAK, MONS_YAK, MH_NATURAL, -3,
-    { {AT_HIT, AF_PLAIN, 18}, {AT_NONE, AF_PLAIN, 0}, {AT_NONE, AF_PLAIN, 0}, {AT_NONE, AF_PLAIN, 0} },
+    { {AT_BUTT, AF_PLAIN, 18}, {AT_NONE, AF_PLAIN, 0}, {AT_NONE, AF_PLAIN, 0}, {AT_NONE, AF_PLAIN, 0} },
     { 7, 3, 5, 0 },
     4, 7, 10, 7, MST_NO_SPELLS, CE_CLEAN, Z_BIG, S_BELLOW, I_ANIMAL, 
     MONUSE_NOTHING, SIZE_BIG
@@ -1668,7 +1668,7 @@
     M_WARM_BLOOD | M_EVIL,
     MR_NO_FLAGS,
     1500, 10, MONS_YAK, MONS_DEATH_YAK, MH_NATURAL, -5,
-    { {AT_HIT, AF_PLAIN, 30}, {AT_NONE, AF_PLAIN, 0}, {AT_NONE, AF_PLAIN, 0}, {AT_NONE, AF_PLAIN, 0} },
+    { {AT_BUTT, AF_PLAIN, 30}, {AT_NONE, AF_PLAIN, 0}, {AT_NONE, AF_PLAIN, 0}, {AT_NONE, AF_PLAIN, 0} },
     { 14, 3, 5, 0 },
     9, 5, 10, 7, MST_NO_SPELLS, CE_POISONOUS, Z_BIG, S_BELLOW, I_ANIMAL, 
     MONUSE_NOTHING, SIZE_BIG
diff --git a/crawl-ref/source/version.h b/crawl-ref/source/version.h
index 2a0fac788b..397c811609 100644
--- a/crawl-ref/source/version.h
+++ b/crawl-ref/source/version.h
@@ -52,6 +52,12 @@
  * *********************************************************************** */
 #define BUILD_DATE __DATE__
 
+#ifdef BUILD_REVISION
+#define VERSION_DETAIL "r" BUILD_REVISION "/" BUILD_DATE
+#else
+#define VERSION_DETAIL BUILD_DATE
+#endif
+
 #define SAVE_MAJOR_VERSION 2
 
 #endif
-- 
cgit v1.2.3-54-g00ecf