aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authormegamage <none@none>2009-02-16 20:14:45 -0600
committermegamage <none@none>2009-02-16 20:14:45 -0600
commit3f731b8c7f1227eb9a97b983f42f77aaf1b734c1 (patch)
tree4371b12e8bd5e16498d87a4cba33f81070739cf4 /src
parent1ad4f8509c10198d7e2c6691a0f17292d6deac0e (diff)
[7287] Remove wrong implementation for spell 37573 dummy effect. It better implement in scripts anyway. Author: NoFantasy
*Note: this requires the import of SD2 script patch otherwise this spell will have no effect. [7286] Remove unused local variable. Author: VladimirMangos --HG-- branch : trunk
Diffstat (limited to 'src')
-rw-r--r--src/game/ObjectMgr.cpp1
-rw-r--r--src/game/SpellEffects.cpp30
-rw-r--r--src/shared/revision_nr.h2
3 files changed, 1 insertions, 32 deletions
diff --git a/src/game/ObjectMgr.cpp b/src/game/ObjectMgr.cpp
index 7b4c2447c2c..35302bc867b 100644
--- a/src/game/ObjectMgr.cpp
+++ b/src/game/ObjectMgr.cpp
@@ -4198,7 +4198,6 @@ GossipText const *ObjectMgr::GetGossipText(uint32 Text_ID) const
void ObjectMgr::LoadGossipText()
{
- GossipText *pGText;
QueryResult *result = WorldDatabase.Query( "SELECT * FROM npc_text" );
int count = 0;
diff --git a/src/game/SpellEffects.cpp b/src/game/SpellEffects.cpp
index 3a33532d9f5..a76f20e0536 100644
--- a/src/game/SpellEffects.cpp
+++ b/src/game/SpellEffects.cpp
@@ -1155,36 +1155,6 @@ void Spell::EffectDummy(uint32 i)
m_caster->CastSpell(m_caster,42337,true,NULL);
return;
}
- case 37573: //Temporal Phase Modulator
- {
- if(!unitTarget)
- return;
-
- TemporarySummon* tempSummon = dynamic_cast<TemporarySummon*>(unitTarget);
- if(!tempSummon)
- return;
-
- uint32 health = tempSummon->GetHealth();
- const uint32 entry_list[6] = {21821, 21820, 21817};
-
- float x = tempSummon->GetPositionX();
- float y = tempSummon->GetPositionY();
- float z = tempSummon->GetPositionZ();
- float o = tempSummon->GetOrientation();
-
- tempSummon->UnSummon();
-
- Creature* pCreature = m_caster->SummonCreature(entry_list[urand(0, 2)], x, y, z, o,TEMPSUMMON_TIMED_OR_DEAD_DESPAWN,180000);
- if (!pCreature)
- return;
-
- pCreature->SetHealth(health);
-
- if(pCreature->AI())
- pCreature->AI()->AttackStart(m_caster);
-
- return;
- }
case 34665: //Administer Antidote
{
if(!unitTarget || m_caster->GetTypeId() != TYPEID_PLAYER )
diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h
index 239221fd113..23d670c2bab 100644
--- a/src/shared/revision_nr.h
+++ b/src/shared/revision_nr.h
@@ -1,4 +1,4 @@
#ifndef __REVISION_NR_H__
#define __REVISION_NR_H__
- #define REVISION_NR "7285"
+ #define REVISION_NR "7287"
#endif // __REVISION_NR_H__