Skip to content

Commit

Permalink
[10926] Remove player-only limit for HandleAuraTransform where miscva…
Browse files Browse the repository at this point in the history
…lue is 0

Add error output for unhandled spells plus minor code cleanup

Signed-off-by: NoFantasy <nofantasy@nf.no>
  • Loading branch information
NoFantasy committed Dec 28, 2010
1 parent a616641 commit 61d8898
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 14 deletions.
23 changes: 10 additions & 13 deletions src/game/SpellAuras.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -3139,14 +3139,9 @@ void Aura::HandleAuraTransform(bool apply, bool Real)
// special case (spell specific functionality)
if (m_modifier.m_miscvalue == 0)
{
// player applied only
if (target->GetTypeId() != TYPEID_PLAYER)
return;

switch (GetId())
{
// Orb of Deception
case 16739:
case 16739: // Orb of Deception
{
uint32 orb_model = target->GetNativeDisplayId();
switch(orb_model)
Expand Down Expand Up @@ -3195,25 +3190,27 @@ void Aura::HandleAuraTransform(bool apply, bool Real)
}
break;
}
// Murloc costume
case 42365: target->SetDisplayId(21723); break;
// Honor the Dead
case 65386:
case 42365: // Murloc costume
target->SetDisplayId(21723);
break;
case 65386: // Honor the Dead
case 65495:
{
switch(target->getGender())
{
case GENDER_MALE:
target->SetDisplayId(29203); // Chapman
target->SetDisplayId(29203); // Chapman
break;
case GENDER_FEMALE:
case GENDER_NONE:
target->SetDisplayId(29204); // Catrina
target->SetDisplayId(29204); // Catrina
break;
}
break;
}
default: break;
default:
sLog.outError("Aura::HandleAuraTransform, spell %u does not have creature entry defined, need custom defined model.", GetId());
break;
}
}
else
Expand Down
2 changes: 1 addition & 1 deletion src/shared/revision_nr.h
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#ifndef __REVISION_NR_H__
#define __REVISION_NR_H__
#define REVISION_NR "10925"
#define REVISION_NR "10926"
#endif // __REVISION_NR_H__

0 comments on commit 61d8898

Please sign in to comment.