From bf3f1877853041dcb86db0429d719adba77776a2 Mon Sep 17 00:00:00 2001
From: megamage <none@none>
Date: Tue, 30 Dec 2008 18:10:11 -0600
Subject: *Fix the bug of rockbiter.

--HG--
branch : trunk
---
 src/game/SpellEffects.cpp              | 2 +-
 src/game/WaypointMovementGenerator.cpp | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/game/SpellEffects.cpp b/src/game/SpellEffects.cpp
index 85984eeaa3d..e693cd9adbd 100644
--- a/src/game/SpellEffects.cpp
+++ b/src/game/SpellEffects.cpp
@@ -3820,7 +3820,7 @@ void Spell::EffectEnchantItemTmp(uint32 i)
     // Shaman Rockbiter Weapon
     if(i==0 && m_spellInfo->Effect[1]==SPELL_EFFECT_DUMMY)
     {
-        int32 enchnting_damage = m_currentBasePoints[1];//+1;
+        int32 enchnting_damage = damage;//+1;
 
         // enchanting id selected by calculated damage-per-sec stored in Effect[1] base value
         // with already applied percent bonus from Elemental Weapons talent
diff --git a/src/game/WaypointMovementGenerator.cpp b/src/game/WaypointMovementGenerator.cpp
index adc4345fdfc..50219bfb6f4 100644
--- a/src/game/WaypointMovementGenerator.cpp
+++ b/src/game/WaypointMovementGenerator.cpp
@@ -152,6 +152,7 @@ WaypointMovementGenerator<Creature>::Update(Creature &unit, const uint32 &diff)
 		{
 			if(StopedByPlayer)
 			{
+                assert(node);
 				InitTraveller(unit,node);
 				i_destinationHolder.SetDestination(traveller, node.x, node.y, node.z);
 				i_nextMoveTime.Reset(i_destinationHolder.GetTotalTravelTime());
-- 
cgit v1.2.3