[ScryMUD] SVN Commit Info r864 - trunk/mud/grrmud/server

[scrymud at wanfear.com]

Author: eroper
Date: 2007-02-08 01:25:12 -0800 (Thu, 08 Feb 2007)
New Revision: 864

Modified:
   trunk/mud/grrmud/server/critter.cc
   trunk/mud/grrmud/server/spec_prc.cc
Log:
Implements: MUD-393
Charmed mobs will no longer execute their scripts or loot corpses after
killing their targets.


Modified: trunk/mud/grrmud/server/critter.cc
===================================================================
--- trunk/mud/grrmud/server/critter.cc	2007-02-08 08:47:07 UTC (rev 863)
+++ trunk/mud/grrmud/server/critter.cc	2007-02-08 09:25:12 UTC (rev 864)
@@ -3838,6 +3838,11 @@
    }
    String buf(100);
 
+   // Charmed mobs shouldn't even check for their scripts. At least for now
+   if ( isCharmed() ) {
+      return;
+   }
+
    if (mob) {
       if (mudlog.ofLevel(DBG)) {
          mudlog << "Was a mob, mob#:  " << MOB_NUM << endl;

Modified: trunk/mud/grrmud/server/spec_prc.cc
===================================================================
--- trunk/mud/grrmud/server/spec_prc.cc	2007-02-08 08:47:07 UTC (rev 863)
+++ trunk/mud/grrmud/server/spec_prc.cc	2007-02-08 09:25:12 UTC (rev 864)
@@ -76,7 +76,7 @@
       }//if
    }//if
 
-   if (agg.mob && agg.mob->proc_data) {
+   if (agg.mob && agg.mob->proc_data && (!agg.isCharmed()) ) {
      int bad_ass = agg.mob->getBadAssedness();
      String cmd("get all corpse\n");
      if (bad_ass > 7) {