summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source
diff options
context:
space:
mode:
authorj-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573>2008-06-17 14:59:23 +0000
committerj-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573>2008-06-17 14:59:23 +0000
commit8b5066cba8aa54f8fdbae7decba3fff80fe6be3e (patch)
tree8e1ec9fd35b8b11b4d6b5dc154920a2d80c58374 /crawl-ref/source
parent9a976932d9978f756dcd631f3543ce152b4a41b7 (diff)
downloadcrawl-ref-8b5066cba8aa54f8fdbae7decba3fff80fe6be3e.tar.gz
crawl-ref-8b5066cba8aa54f8fdbae7decba3fff80fe6be3e.zip
Remove my stupid debugging mprs (whoops), fix eyes only staring at the
player when fleeing and make oklob plants spit again (BR 1995290) git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@5921 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source')
-rw-r--r--crawl-ref/source/directn.cc1
-rw-r--r--crawl-ref/source/monstuff.cc5
-rw-r--r--crawl-ref/source/spl-util.cc1
3 files changed, 3 insertions, 4 deletions
diff --git a/crawl-ref/source/directn.cc b/crawl-ref/source/directn.cc
index f9800d3a21..6e395a802a 100644
--- a/crawl-ref/source/directn.cc
+++ b/crawl-ref/source/directn.cc
@@ -960,7 +960,6 @@ void direction(dist& moves, targeting_type restricts,
&& mode == TARG_ENEMY
&& !yesno("Really target yourself?", false, 'n'))
{
- mpr("not self-targetting");
mesclr();
show_prompt = true;
}
diff --git a/crawl-ref/source/monstuff.cc b/crawl-ref/source/monstuff.cc
index 825fc4e96f..f18aa3dc23 100644
--- a/crawl-ref/source/monstuff.cc
+++ b/crawl-ref/source/monstuff.cc
@@ -3673,7 +3673,7 @@ static void _handle_nearby_ability(monsters *monster)
case MONS_GIANT_EYEBALL:
if (coinflip() && !mons_friendly(monster)
&& !mons_is_wandering(monster)
- && mons_is_fleeing(monster))
+ && !mons_is_fleeing(monster))
{
simple_monster_message(monster, " stares at you.");
@@ -3686,7 +3686,7 @@ static void _handle_nearby_ability(monsters *monster)
case MONS_EYE_OF_DRAINING:
if (coinflip() && !mons_friendly(monster)
&& !mons_is_wandering(monster)
- && mons_is_fleeing(monster))
+ && !mons_is_fleeing(monster))
{
simple_monster_message(monster, " stares at you.");
@@ -3894,6 +3894,7 @@ static bool _handle_special_ability(monsters *monster, bolt & beem)
break;
case MONS_ACID_BLOB:
+ case MONS_OKLOB_PLANT:
case MONS_YELLOW_DRACONIAN:
if (monster->has_ench(ENCH_CONFUSION))
break;
diff --git a/crawl-ref/source/spl-util.cc b/crawl-ref/source/spl-util.cc
index 416a13b28f..f308ca2f55 100644
--- a/crawl-ref/source/spl-util.cc
+++ b/crawl-ref/source/spl-util.cc
@@ -770,7 +770,6 @@ bool spell_direction( dist &spelld, bolt &pbolt,
if (!spelld.isValid)
{
// Check for user cancel.
- mpr("user canceled");
canned_msg(MSG_OK);
return (false);
}