From f5ad2d06f0bac4de0a61d97b8887b70616006969 Mon Sep 17 00:00:00 2001 From: Adam Borowski Date: Tue, 15 Dec 2009 00:01:58 +0100 Subject: Make mimics hold the item they're mimicking, instead of fragile hacks with saving RNG state. --- crawl-ref/source/travel.cc | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) (limited to 'crawl-ref/source/travel.cc') diff --git a/crawl-ref/source/travel.cc b/crawl-ref/source/travel.cc index f8e4eb55cb..6da7bc6ee0 100644 --- a/crawl-ref/source/travel.cc +++ b/crawl-ref/source/travel.cc @@ -546,11 +546,7 @@ inline static void _check_interesting_square(int x, int y, if (const monsters *mons = monster_at(pos)) { if (mons_is_unknown_mimic(mons)) - { - item_def item; - get_mimic_item(mons, item); - ed.found_item(pos, item); - } + ed.found_item(pos, get_mimic_item(mons)); } if (igrd(pos) != NON_ITEM) @@ -1084,12 +1080,8 @@ static bool _is_greed_inducing_square(const LevelStashes *ls, if (const monsters *mons = monster_at(c)) { if (mons_is_unknown_mimic(mons) && mons_was_seen(mons)) - { - item_def mimic_item; - get_mimic_item(mons, mimic_item); - if (item_needs_autopickup(mimic_item)) + if (item_needs_autopickup(get_mimic_item(mons))) return (true); - } } return (false); } -- cgit v1.2.3-54-g00ecf