Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-23 18:36:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Scripts/Icecrown Citadel: Compile warning fixes

Browse Source
This commit is contained in:
Shauren
2011-03-19 11:44:04 +01:00
parent c5bf4f06ae
commit cb33b050d9
10 changed files with 43 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/server/scripts/Spells/spell_quest.cpp
View File

@@ -27,7 +27,7 @@ class spell_generic_quest_update_entry_SpellScript : public SpellScript
{
PrepareSpellScript(spell_generic_quest_update_entry_SpellScript)
private:
uint32 _spellEffect;
uint16 _spellEffect;
uint8 _effIndex;
uint32 _originalEntry;
uint32 _newEntry;
@@ -35,21 +35,21 @@ private:
uint32 _despawnTime;
public:
spell_generic_quest_update_entry_SpellScript(uint32 spellEffect, uint8 effIndex, uint32 originalEntry, uint32 newEntry, bool shouldAttack, uint32 despawnTime = 0) :
spell_generic_quest_update_entry_SpellScript(uint16 spellEffect, uint8 effIndex, uint32 originalEntry, uint32 newEntry, bool shouldAttack, uint32 despawnTime = 0) :
SpellScript(), _spellEffect(spellEffect), _effIndex(effIndex), _originalEntry(originalEntry),
_newEntry(newEntry), _shouldAttack(shouldAttack), _despawnTime(despawnTime) { }
void HandleDummy(SpellEffIndex /*effIndex*/)
{
if (Creature* pCreatureTarget = GetHitCreature())
if (!pCreatureTarget->isPet() && pCreatureTarget->GetEntry() == _originalEntry)
if (Creature* creatureTarget = GetHitCreature())
if (!creatureTarget->isPet() && creatureTarget->GetEntry() == _originalEntry)
{
pCreatureTarget->UpdateEntry(_newEntry);
if (_shouldAttack && pCreatureTarget->IsAIEnabled)
pCreatureTarget->AI()->AttackStart(GetCaster());
creatureTarget->UpdateEntry(_newEntry);
if (_shouldAttack && creatureTarget->IsAIEnabled)
creatureTarget->AI()->AttackStart(GetCaster());
if (_despawnTime)
pCreatureTarget->DespawnOrUnsummon(_despawnTime);
creatureTarget->DespawnOrUnsummon(_despawnTime);
}
}
@@ -756,6 +756,7 @@ class spell_q10041_q10040_who_are_they : public SpellScriptLoader
void HandleScript(SpellEffIndex effIndex)
{
PreventHitDefaultEffect(effIndex);
if (!GetHitUnit() || !GetHitUnit()->ToPlayer())
return;