summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorzelgadis <zelgadis@c06c8d41-db1a-0410-9941-cceddc491573>2008-06-01 09:08:39 +0000
committerzelgadis <zelgadis@c06c8d41-db1a-0410-9941-cceddc491573>2008-06-01 09:08:39 +0000
commitcd46d3d8df2dfddda422fa80cfc47240de365b13 (patch)
treeff83e53bc6961d65f3ef09f93c9f5b9616fb9455
parent7e91fc9390fa6cc0fc59e8a59deb2d6744a17069 (diff)
downloadcrawl-ref-cd46d3d8df2dfddda422fa80cfc47240de365b13.tar.gz
crawl-ref-cd46d3d8df2dfddda422fa80cfc47240de365b13.zip
Nothing was happening when a monster drank a potion of invisibility or
speed because the code was using the old system of choosing the effect via setting beem.colour instead of setting beem.flavour git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@5399 c06c8d41-db1a-0410-9941-cceddc491573
-rw-r--r--crawl-ref/source/monstuff.cc7
1 files changed, 4 insertions, 3 deletions
diff --git a/crawl-ref/source/monstuff.cc b/crawl-ref/source/monstuff.cc
index 19e4259a87..f06d2b4eda 100644
--- a/crawl-ref/source/monstuff.cc
+++ b/crawl-ref/source/monstuff.cc
@@ -3775,7 +3775,7 @@ static bool _handle_potion(monsters *monster, bolt & beem)
if (monster->has_ench(ENCH_HASTE))
break;
- beem.colour = BLUE;
+ beem.flavour = BEAM_HASTE;
// intentional fall through
case POT_INVISIBILITY:
if (mitm[monster->inv[MSLOT_POTION]].sub_type == POT_INVISIBILITY)
@@ -3783,7 +3783,7 @@ static bool _handle_potion(monsters *monster, bolt & beem)
if (monster->has_ench(ENCH_INVIS))
break;
- beem.colour = MAGENTA;
+ beem.flavour = BEAM_INVISIBILITY;
// Friendly monsters won't go invisible if the player
// can't see invisible. We're being nice.
if (mons_friendly(monster) && !player_see_invis(false))
@@ -3794,7 +3794,8 @@ static bool _handle_potion(monsters *monster, bolt & beem)
simple_monster_message(monster, " drinks a potion.");
mons_ench_f2(monster, beem);
imbibed = true;
- ident = ID_KNOWN_TYPE;
+ if (beem.obvious_effect)
+ ident = ID_KNOWN_TYPE;
break;
}