summaryrefslogtreecommitdiffstats
path: root/trunk/source/effects.cc
diff options
context:
space:
mode:
authordshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573>2006-08-02 12:54:15 +0000
committerdshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573>2006-08-02 12:54:15 +0000
commitd5e5340c3926d1cf97f6cba151ffaecb20bfb35f (patch)
treed1faf7d5b27df8f3c523a8dd33357804118e62b1 /trunk/source/effects.cc
parent7b2204d69f21d7075e4666ee032d7a129081bc4b (diff)
downloadcrawl-ref-d5e5340c3926d1cf97f6cba151ffaecb20bfb35f.tar.gz
crawl-ref-d5e5340c3926d1cf97f6cba151ffaecb20bfb35f.zip
Integrated travel patch as of 20060727
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@7 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'trunk/source/effects.cc')
-rw-r--r--trunk/source/effects.cc19
1 files changed, 17 insertions, 2 deletions
diff --git a/trunk/source/effects.cc b/trunk/source/effects.cc
index c2645e1b73..16517cba40 100644
--- a/trunk/source/effects.cc
+++ b/trunk/source/effects.cc
@@ -95,7 +95,7 @@ void banished(unsigned char gate_type)
// this is to ensure that you're standing on a suitable space (67)
grd[you.x_pos][you.y_pos] = gate_type;
- down_stairs(true, you.your_level); // heh heh
+ down_stairs(true, you.your_level, true); // heh heh
untag_followers(); // safety
} // end banished()
@@ -434,7 +434,7 @@ void random_uselessness(unsigned char ru, unsigned char sc_read_2)
return;
} // end random_uselessness()
-bool acquirement(unsigned char force_class)
+bool acquirement(unsigned char force_class, int agent)
{
int thing_created = 0;
int iteration = 0;
@@ -620,6 +620,18 @@ bool acquirement(unsigned char force_class)
case SP_OGRE:
case SP_OGRE_MAGE:
case SP_TROLL:
+ case SP_RED_DRACONIAN:
+ case SP_WHITE_DRACONIAN:
+ case SP_GREEN_DRACONIAN:
+ case SP_GOLDEN_DRACONIAN:
+ case SP_GREY_DRACONIAN:
+ case SP_BLACK_DRACONIAN:
+ case SP_PURPLE_DRACONIAN:
+ case SP_MOTTLED_DRACONIAN:
+ case SP_PALE_DRACONIAN:
+ case SP_UNK0_DRACONIAN:
+ case SP_UNK1_DRACONIAN:
+ case SP_UNK2_DRACONIAN:
case SP_SPRIGGAN:
if (type_wanted == ARM_GLOVES || type_wanted == ARM_BOOTS)
{
@@ -1235,7 +1247,10 @@ bool acquirement(unsigned char force_class)
// move_item_to_grid works (doesn't create a new item ever),
// but we're checking it anyways. -- bwr
if (thing_created != NON_ITEM)
+ {
canned_msg(MSG_SOMETHING_APPEARS);
+ origin_acquired(mitm[thing_created], agent);
+ }
}
// Well, the item may have fallen in the drink, but the intent is