summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/decks.cc
diff options
context:
space:
mode:
authordshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573>2007-12-30 09:35:41 +0000
committerdshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573>2007-12-30 09:35:41 +0000
commit5cdc214dfd97a588ff443dae8ff1fc513693dae9 (patch)
tree89bda913fb9cfcef17b799cea5dc8dff350a94c3 /crawl-ref/source/decks.cc
parent460535315751ea2239a98f1817ee0c1c11720e81 (diff)
downloadcrawl-ref-5cdc214dfd97a588ff443dae8ff1fc513693dae9.tar.gz
crawl-ref-5cdc214dfd97a588ff443dae8ff1fc513693dae9.zip
Summoned monsters will now take back only items they were summoned with - subsequently acquired items will be left behind when they disappear.
MF_HARD_RESET should now be used only for dancing weapons - other summons are generated with items marked appropriately. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@3148 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/decks.cc')
-rw-r--r--crawl-ref/source/decks.cc8
1 files changed, 3 insertions, 5 deletions
diff --git a/crawl-ref/source/decks.cc b/crawl-ref/source/decks.cc
index d9704056d8..a37728d045 100644
--- a/crawl-ref/source/decks.cc
+++ b/crawl-ref/source/decks.cc
@@ -2451,11 +2451,9 @@ static void summon_skeleton(int power, deck_rarity_type rarity)
MONS_SKELETON_LARGE, MONS_SKELETAL_WARRIOR, MONS_SKELETAL_DRAGON
};
- const int mon = create_monster(skeltypes[power_level], std::min(power/50,6),
- friendly ? BEH_FRIENDLY : BEH_HOSTILE,
- you.x_pos, you.y_pos, MHITYOU, 250 );
- if ( mon != -1 ) // don't want skeletal warriors dropping stuff
- menv[mon].flags |= MF_HARD_RESET;
+ create_monster(skeltypes[power_level], std::min(power/50,6),
+ friendly ? BEH_FRIENDLY : BEH_HOSTILE,
+ you.x_pos, you.y_pos, MHITYOU, 250 );
}
static int card_power(deck_rarity_type rarity)