4 files changed, 6 insertions, 4 deletions
diff --git a/crawl-ref/source/dat/descript/skills.txt b/crawl-ref/source/dat/descript/skills.txt
index 44fb34a4e4..09510f035d 100644
--- a/crawl-ref/source/dat/descript/skills.txt
+++ b/crawl-ref/source/dat/descript/skills.txt
@@ -8,6 +8,8 @@ Fighting
 
 Apart from making you more proficient in hand-to-hand combat, Fighting
 also increases your maximum hitpoints.
+Fighting can be trained up to level 2 by attacking plants or fungi,
+afterwards only real opponents count.
 %%%%
 Short Blades
 
diff --git a/crawl-ref/source/mon-util.cc b/crawl-ref/source/mon-util.cc
index 4fc0db2260..7539df4f20 100644
--- a/crawl-ref/source/mon-util.cc
+++ b/crawl-ref/source/mon-util.cc
@@ -6843,7 +6843,7 @@ void monsters::remove_enchantment_effect(const mon_enchant &me, bool quiet)
                 autotoggle_autopickup(false);
             }
 
-            seen_monster(this);
+            handle_seen_interrupt(this);
         }
         break;
 
diff --git a/crawl-ref/source/monspeak.cc b/crawl-ref/source/monspeak.cc
index 7c61f323bf..07e284fd19 100644
--- a/crawl-ref/source/monspeak.cc
+++ b/crawl-ref/source/monspeak.cc
@@ -809,7 +809,7 @@ bool mons_speaks_msg(monsters *monster, const std::string &msg,
         else
         {
             if (you.can_see(monster))
-                seen_monster(monster);
+                handle_seen_interrupt(monster);
             mpr(line.c_str(), msg_type);
         }
     }
diff --git a/crawl-ref/source/mstuff2.cc b/crawl-ref/source/mstuff2.cc
index 903364dd1e..a6226acecd 100644
--- a/crawl-ref/source/mstuff2.cc
+++ b/crawl-ref/source/mstuff2.cc
@@ -1138,7 +1138,7 @@ void monster_teleport(monsters *monster, bool instan, bool silent)
     }
 
     if (player_monster_visible(monster) && now_visible)
-        seen_monster(monster);
+        handle_seen_interrupt(monster);
 
     monster->check_redraw(oldplace);
     monster->apply_location_effects(oldplace);
@@ -2583,7 +2583,7 @@ int clone_mons(const monsters* orig, bool quiet, bool* obvious,
     mark_interesting_monst(&mon, mon.behaviour);
     if (you.can_see(&mon))
     {
-        seen_monster(&mon);
+        handle_seen_interrupt(&mon);
         viewwindow(true, false);
     }