mangos-mirror/server
0
0
Fork 0
mirror of https://github.com/mangosfour/server.git synced 2025-12-13 04:37:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[11554] Add some "tail" data for SMSG_CAST_FAILED and SMSG_PET_CAST_FAILED

Browse source 
Not all SPELL_FAILED_* are used currently (but ok for future implementation)

Signed-off-by: NoFantasy <nofantasy@nf.no>
This commit is contained in:
NoFantasy 2011-05-28 13:05:16 +02:00
parent 3beb20b67d
commit 6b3359575b
3 changed files with 24 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/game/Spell.cpp
View file

@ -3560,6 +3560,9 @@ void Spell::SendCastResult(Player* caster, SpellEntry const* spellInfo, uint8 ca
data << uint8(result); // problem data << uint8(result); // problem
switch (result) switch (result)
{ {
case SPELL_FAILED_NOT_READY:
data << uint32(0); // unknown, value 1 seen for 14177
break;
case SPELL_FAILED_REQUIRES_SPELL_FOCUS: case SPELL_FAILED_REQUIRES_SPELL_FOCUS:
data << uint32(spellInfo->RequiresSpellFocus); data << uint32(spellInfo->RequiresSpellFocus);
break; break;
@ -3598,6 +3601,15 @@ void Spell::SendCastResult(Player* caster, SpellEntry const* spellInfo, uint8 ca
data << uint32(spellInfo->EquippedItemSubClassMask); data << uint32(spellInfo->EquippedItemSubClassMask);
//data << uint32(spellInfo->EquippedItemInventoryTypeMask); //data << uint32(spellInfo->EquippedItemInventoryTypeMask);
break; break;
case SPELL_FAILED_EQUIPPED_ITEM_CLASS_MAINHAND:
case SPELL_FAILED_EQUIPPED_ITEM_CLASS_OFFHAND:
// same data as SPELL_FAILED_EQUIPPED_ITEM_CLASS ?
data << uint32(0);
data << uint32(0);
break;
case SPELL_FAILED_PREVENTED_BY_MECHANIC:
data << uint32(0); // unknown, mechanic mask?
break;
default: default:
break; break;
} }

13
src/game/Unit.cpp
View file

@ -9870,8 +9870,17 @@ void Unit::SendPetCastFail(uint32 spellid, SpellCastResult msg)
data << uint8(0); // cast count? data << uint8(0); // cast count?
data << uint32(spellid); data << uint32(spellid);
data << uint8(msg); data << uint8(msg);
// uint32 for some reason
// uint32 for some reason // More cases exist, see Spell::SendCastResult (can possibly be unified)
switch(msg)
{
case SPELL_FAILED_NOT_READY:
data << uint32(0); // unknown
break;
default:
break;
}
((Player*)owner)->GetSession()->SendPacket(&data); ((Player*)owner)->GetSession()->SendPacket(&data);
} }

2
src/shared/revision_nr.h
View file

@ -1,4 +1,4 @@
#ifndef __REVISION_NR_H__ #ifndef __REVISION_NR_H__
#define __REVISION_NR_H__ #define __REVISION_NR_H__
#define REVISION_NR "11553" #define REVISION_NR "11554"
#endif // __REVISION_NR_H__ #endif // __REVISION_NR_H__