From f29104e71ce08825a646634a69bca6cfe1f6c21a Mon Sep 17 00:00:00 2001
From: haranp <haranp@c06c8d41-db1a-0410-9941-cceddc491573>
Date: Sat, 3 Nov 2007 12:29:53 +0000
Subject: Added HURRY option to makefile.unix. Slightly changed how randart
 weapon/armour mimics work.

git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@2730 c06c8d41-db1a-0410-9941-cceddc491573
---
 crawl-ref/source/decks.cc      |  1 +
 crawl-ref/source/makefile.unix |  9 +++++++--
 crawl-ref/source/monstuff.cc   | 10 +++++++---
 3 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/crawl-ref/source/decks.cc b/crawl-ref/source/decks.cc
index 29be1c6757..22856c2c7a 100644
--- a/crawl-ref/source/decks.cc
+++ b/crawl-ref/source/decks.cc
@@ -2007,6 +2007,7 @@ static void curse_card(int power, deck_rarity_type rarity)
 {
     const int power_level = get_power_level(power, rarity);
 
+    mpr("You feel a malignant aura surround you.");
     if ( power_level >= 2 )
     {
         // curse (almost) everything + decay
diff --git a/crawl-ref/source/makefile.unix b/crawl-ref/source/makefile.unix
index 36ee1ef1f8..e671d68a25 100644
--- a/crawl-ref/source/makefile.unix
+++ b/crawl-ref/source/makefile.unix
@@ -89,9 +89,14 @@ LIB = -l$(LIBCURS) -L$(LUASRC) -l$(LUALIB) $(LIBDBM)
 
 INCLUDES := $(INCLUDES) -Iutil -I. -I$(LUASRC) $(EXTRA_INCLUDES)
 
-CFWARN := -Wall -Wwrite-strings -Wshadow -Wuninitialized -pedantic
+CFWARN := -Wall -Wwrite-strings -Wshadow -pedantic
 
-CFOTHERS := -O2 -fsigned-char -D$(OS_TYPE) $(EXTRA_FLAGS) -DCLUA_BINDINGS
+CFOTHERS := -fsigned-char -D$(OS_TYPE) $(EXTRA_FLAGS) -DCLUA_BINDINGS
+
+ifneq ($(HURRY),y)
+CFWARN += -Wuninitialized
+CFOTHERS += -O2
+endif
 
 ifneq ($(SAVEDIR),)
 CFOTHERS += '-DSAVE_DIR_PATH="$(SAVEDIR)"'
diff --git a/crawl-ref/source/monstuff.cc b/crawl-ref/source/monstuff.cc
index 92b457d3c9..a925b423cc 100644
--- a/crawl-ref/source/monstuff.cc
+++ b/crawl-ref/source/monstuff.cc
@@ -88,7 +88,7 @@ static bool immobile_monster[MAX_MONSTERS];
 #define FAR_AWAY    1000000         // used in monster_move()
 
 // This function creates an artificial item to represent a mimic's appearance.
-// Eventually, mimics could be redone to be more like Dancing wepaons...
+// Eventually, mimics could be redone to be more like dancing weapons...
 // there'd only be one type and it would look like the item it carries. -- bwr
 void get_mimic_item( const monsters *mimic, item_def &item )
 {
@@ -118,7 +118,10 @@ void get_mimic_item( const monsters *mimic, item_def &item )
 
         if (prop < 20)
         {
-            item.flags |= ISFLAG_RANDART;
+            make_item_randart(item);
+            // Override special - this could cause a "bad" (no-properties)
+            // randart, but we only need the name anyway. We have to
+            // do this in order to get a consistent name for the mimic item.
             item.special = ((mimic->x << 8 + mimic->y) & RANDART_SEED_MASK);
         }
         else if (prop < 50)
@@ -146,7 +149,8 @@ void get_mimic_item( const monsters *mimic, item_def &item )
 
         if (prop < 20)
         {
-            item.flags |= ISFLAG_RANDART;
+            make_item_randart(item);
+            // See comment above for randart weapon mimics.
             item.special = ((mimic->x << 8 + mimic->y) & RANDART_SEED_MASK);
         }
         else if (prop < 40)
-- 
cgit v1.2.3-54-g00ecf