[crawl-ref-commits] SF.net SVN: crawl-ref:[9859] trunk/crawl-ref/source/monstuff.cc

[<dol...@us...>]

Revision: 9859
          http://crawl-ref.svn.sourceforge.net/crawl-ref/?rev=9859&view=rev
Author:   dolorous
Date:     2009-05-31 13:10:52 +0000 (Sun, 31 May 2009)

Log Message:
-----------
Forward-port minor shaft trap tweaks for pacified monsters from 0.5 
branch r9858.

Modified Paths:
--------------
    trunk/crawl-ref/source/monstuff.cc

Modified: trunk/crawl-ref/source/monstuff.cc
===================================================================
--- trunk/crawl-ref/source/monstuff.cc	2009-05-31 09:53:38 UTC (rev 9858)
+++ trunk/crawl-ref/source/monstuff.cc	2009-05-31 13:10:52 UTC (rev 9859)
@@ -3120,8 +3120,13 @@
                 dir == CMD_GO_DOWNSTAIRS ? "goes down"
                                          : "takes").c_str());
     }
-    else if (is_shaft && mons_flies(mon))
-        simple_monster_message(mon, " goes down the shaft.");
+    else if (is_shaft)
+    {
+        if (mons_flies(mon))
+            simple_monster_message(mon, " goes down the shaft.");
+        else
+            simple_monster_message(mon, " jumps into the shaft.");
+    }
 }
 
 void make_mons_leave_level(monsters *mon)
@@ -7935,8 +7940,8 @@
 
     if (trap.type == TRAP_SHAFT && monster->will_trigger_shaft())
     {
-        if ((mons_is_fleeing(monster) || mons_is_pacified(monster))
-            && intel >= I_NORMAL)
+        if (mons_is_fleeing(monster) && intel >= I_NORMAL
+            || mons_is_pacified(monster))
         {
             return (true);
         }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.