*Backout some WTF fixes. Do things correctly, or do not touch them at all...

*Really fix windows build.

--HG--
branch : trunk

10 files changed, 19 insertions, 19 deletions

diff --git a/sql/updates/7364_world_spell_linked_spell.sql b/sql/updates/7364_world_spell_linked_spell.sql
new file mode 100644
index 00000000000..fa24e3b7b04
--- /dev/null
+++ b/sql/updates/7364_world_spell_linked_spell.sql
@@ -0,0 +1 @@
+DELETE FROM spell_linked_spell WHERE spell_trigger = 31687;
\ No newline at end of file
diff --git a/sql/world.sql b/sql/world.sql
index 35179613d40..fca4fde2f0b 100644
--- a/sql/world.sql
+++ b/sql/world.sql
@@ -5825,7 +5825,6 @@ INSERT INTO `spell_linked_spell` (`spell_trigger`,`spell_effect`,`type`,`comment
 ( 54850, 54851, 1, 'Emerge - Emerge Summon'),
 -- Trial of the Champion
 ( 66680, 66547, 0, 'Confess - Confess'),
-( 31687, 70907, 0, 'Summon Water Elemental'),
 ( 66889,-66865, 0, 'Remove Vengeance');
 /*!40000 ALTER TABLE `spell_linked_spell` ENABLE KEYS */;
 UNLOCK TABLES;
diff --git a/src/game/Item.cpp b/src/game/Item.cpp
index 00f271ca89e..b2821ae7b83 100644
--- a/src/game/Item.cpp
+++ b/src/game/Item.cpp
@@ -771,10 +771,6 @@ bool Item::IsFitToSpellRequirements(SpellEntry const* spellInfo) const
 {
     ItemPrototype const* proto = GetProto();
 
-    //Lava Lash
-    if (spellInfo->Id==60103 && spellInfo->EquippedItemClass==ITEM_CLASS_WEAPON)
-         return true;
-
     if (spellInfo->EquippedItemClass != -1)                 // -1 == any item class
     {
         // Special case - accept vellum for armor/weapon requirements
diff --git a/src/game/Player.cpp b/src/game/Player.cpp
index f83fc526009..fb0b1aebfc4 100644
--- a/src/game/Player.cpp
+++ b/src/game/Player.cpp
@@ -286,8 +286,6 @@ UpdateMask Player::updateVisualBits;
 
 Player::Player (WorldSession *session): Unit(), m_achievementMgr(this), m_reputationMgr(this)
 {
-    m_isSaved = false;
-
     m_speakTime = 0;
     m_speakCount = 0;
 
@@ -17084,15 +17082,12 @@ bool Player::_LoadHomeBind(QueryResult_AutoPtr result)
 void Player::SaveToDB()
 {
     // delay auto save at any saves (manual, in code, or autosave)
-    m_isSaved = true;
-
     m_nextSave = sWorld.getConfig(CONFIG_INTERVAL_SAVE);
 
     //lets allow only players in world to be saved
     if (IsBeingTeleportedFar())
     {
         ScheduleDelayedOperation(DELAYED_SAVE_PLAYER);
-        m_isSaved = false;
         return;
     }
 
@@ -17226,7 +17221,6 @@ void Player::SaveToDB()
     // save pet (hunter pet level and experience and all type pets health/mana).
     if (Pet* pet = GetPet())
         pet->SavePetToDB(PET_SAVE_AS_CURRENT);
-    m_isSaved = false;
 }
 
 // fast save function for item/money cheating preventing - save only inventory and money state
diff --git a/src/game/Player.h b/src/game/Player.h
index bfd9225947e..d5c7caafc49 100644
--- a/src/game/Player.h
+++ b/src/game/Player.h
@@ -2582,8 +2582,6 @@ Spell * m_spellModTakingSpell;
 
         uint32 m_ChampioningFaction;
 
-        bool m_isSaved;
-
         uint32 m_timeSyncCount;
         uint32 m_timeSyncTimer;
 };
diff --git a/src/game/Spell.cpp b/src/game/Spell.cpp
index 3451e75c571..8e2438464e2 100644
--- a/src/game/Spell.cpp
+++ b/src/game/Spell.cpp
@@ -1982,10 +1982,6 @@ void Spell::SelectEffectTargets(uint32 i, uint32 cur)
         {
             if (cur == TARGET_SRC_CASTER)
             {
-                // Earthen Power
-                if (m_spellInfo->Id == 3600)
-                    AddUnitTarget(m_caster, i);
-
                 m_targets.setSrc(m_caster);
                 break;
             }
diff --git a/src/game/SpellEffects.cpp b/src/game/SpellEffects.cpp
index ccf3abe022d..48ce576b38d 100644
--- a/src/game/SpellEffects.cpp
+++ b/src/game/SpellEffects.cpp
@@ -1518,6 +1518,17 @@ void Spell::EffectDummy(uint32 i)
                     }
                     return;
                 }
+                case 31687: // Summon Water Elemental
+                {
+                    if (!unitTarget)
+                        return;
+
+                    // Glyph of Eternal Water
+                    if (unitTarget->HasAura(70937))
+                        unitTarget->CastSpell(unitTarget, 70908, true);
+                    else 
+                        unitTarget->CastSpell(unitTarget, 70907, true);
+                }
             }
             break;
         case SPELLFAMILY_WARRIOR:
diff --git a/src/game/SpellMgr.cpp b/src/game/SpellMgr.cpp
index 6a0804baea3..47c9d8b6935 100644
--- a/src/game/SpellMgr.cpp
+++ b/src/game/SpellMgr.cpp
@@ -3766,6 +3766,11 @@ void SpellMgr::LoadSpellCustomAttr()
             spellInfo->EffectImplicitTargetB[1] = TARGET_UNIT_AREA_ALLY_SRC;
             count++;
             break;
+        case 31687: // Summon Water Elemental
+            // 322-330 switch - effect changed to dummy, target entry not changed in client:(
+            spellInfo->EffectImplicitTargetA[0] = TARGET_UNIT_CASTER;
+            count++;
+            break;
         default:
             break;
         }
diff --git a/src/game/Unit.cpp b/src/game/Unit.cpp
index f0d6f0b9b4b..c5586f7ae51 100644
--- a/src/game/Unit.cpp
+++ b/src/game/Unit.cpp
@@ -523,8 +523,7 @@ void Unit::UpdateInterruptMask()
 {
     m_interruptMask = 0;
     for(AuraApplicationList::const_iterator i = m_interruptableAuras.begin(); i != m_interruptableAuras.end(); ++i)
-        if (*i && (*i)->GetBase() && (*i)->GetBase()->GetSpellProto())
-            m_interruptMask |= (*i)->GetBase()->GetSpellProto()->AuraInterruptFlags;
+        m_interruptMask |= (*i)->GetBase()->GetSpellProto()->AuraInterruptFlags;
 
     if (Spell* spell = m_currentSpells[CURRENT_CHANNELED_SPELL])
         if (spell->getState() == SPELL_STATE_CASTING)
diff --git a/win/VC90/game.vcproj b/win/VC90/game.vcproj
index e8592625117..01455bd92e3 100644
--- a/win/VC90/game.vcproj
+++ b/win/VC90/game.vcproj
@@ -3172,6 +3172,7 @@
 						RelativePath="..\..\src\scripts\northrend\frozen_halls\halls_of_reflection\instance_halls_of_reflection.cpp"
 						>
 					</File>
+				</Filter>
 				<Filter
 					Name="Pit of Saron"
 					>