Changeset 98 for trunk/src/game

Timestamp:

11/19/08 13:35:21 (17 years ago)

Author:

yumileroy

Message:

[svn] Fix a bug that shaman's shield can stack.
Fix: MovementInform? without behavior change for waypoint movement. Patch provided by DragonHunter?.
Update gruul lair script. Patch provided by Blaymoira.

Original author: megamage
Date: 2008-10-22 09:41:31-05:00

Location:

trunk/src/game

Files:

• SpellMgr.cpp (modified) (1 diff)
• WaypointMovementGenerator.cpp (modified) (1 diff)

trunk/src/game/SpellMgr.cpp

@@ -1041 +1041 @@
         if(spellInfo_1->SpellFamilyFlags == spellInfo_2->SpellFamilyFlags)
             return true;
+        if(spellInfo_1->SpellFamilyName == SPELLFAMILY_SHAMAN)
+            if(IsElementalShield(spellInfo_1) && IsElementalShield(spellInfo_2))
+                return true;
         //Corruption & Seed of corruption
         if(spellInfo_1->SpellFamilyName == SPELLFAMILY_WARLOCK)

trunk/src/game/WaypointMovementGenerator.cpp

@@ -166 +166 @@
                         creature.Say(behavior->text[0].c_str(), 0, 0);
                 }
-
-                i_hasDone[idx] = true;
-                MovementInform(creature);
             }                                               // wpBehaviour found
+            i_hasDone[idx] = true;
+            MovementInform(creature);
         }                                                   // HasDone == false
     }                                                       // i_creature.IsStopped()