josh/TCPlayerbotCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

*Fix size of SMSG_SPELLHEALLOG and build (rage!!!)

Browse Source 
--HG--
branch : trunk
This commit is contained in:
QAston
2010-08-27 21:07:33 +02:00
parent 6c3015a7e6
commit 91233b9ba8
3 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server/game/Entities/Unit/Unit.cpp
+2 -1
View File
@@ -10153,7 +10153,7 @@ void Unit::UnsummonAllTotems()
void Unit::SendHealSpellLog(Unit *pVictim, uint32 SpellID, uint32 Damage, uint32 OverHeal, uint32 Absorb, bool critical) void Unit::SendHealSpellLog(Unit *pVictim, uint32 SpellID, uint32 Damage, uint32 OverHeal, uint32 Absorb, bool critical)
{ {
// we guess size // we guess size
WorldPacket data(SMSG_SPELLHEALLOG, (8+8+4+4+4+4+1)); WorldPacket data(SMSG_SPELLHEALLOG, (8+8+4+4+4+4+1+1));
data.append(pVictim->GetPackGUID()); data.append(pVictim->GetPackGUID());
data.append(GetPackGUID()); data.append(GetPackGUID());
data << uint32(SpellID); data << uint32(SpellID);
@@ -10161,6 +10161,7 @@ void Unit::SendHealSpellLog(Unit *pVictim, uint32 SpellID, uint32 Damage, uint32
data << uint32(OverHeal); data << uint32(OverHeal);
data << uint32(Absorb); // Absorb amount data << uint32(Absorb); // Absorb amount
data << uint8(critical ? 1 : 0); data << uint8(critical ? 1 : 0);
data << uint8(0); // unused
SendMessageToSet(&data, true); SendMessageToSet(&data, true);
} }
src/server/game/Spells/SpellMgr.cpp
+2 -2
View File
@@ -1896,7 +1896,7 @@ int32 SpellMgr::CalculateSpellEffectBaseAmount(int32 value, SpellEntry const * s
return value - 1; return value - 1;
} }
float SpellMgr::CalculateSpellEffectValueMultiplier(SpellEntry const * spellEntry, uint8 effIndex, Unit * caster, Spell const * spell) float SpellMgr::CalculateSpellEffectValueMultiplier(SpellEntry const * spellEntry, uint8 effIndex, Unit * caster, Spell * spell)
{ {
float multiplier = spellEntry->EffectValueMultiplier[effIndex]; float multiplier = spellEntry->EffectValueMultiplier[effIndex];
@@ -1906,7 +1906,7 @@ float SpellMgr::CalculateSpellEffectValueMultiplier(SpellEntry const * spellEntr
return multiplier; return multiplier;
} }
float SpellMgr::CalculateSpellEffectDamageMultiplier(SpellEntry const * spellEntry, uint8 effIndex, Unit * caster, Spell const * spell) float SpellMgr::CalculateSpellEffectDamageMultiplier(SpellEntry const * spellEntry, uint8 effIndex, Unit * caster, Spell * spell)
{ {
float multiplier = spellEntry->EffectDamageMultiplier[effIndex]; float multiplier = spellEntry->EffectDamageMultiplier[effIndex];
src/server/game/Spells/SpellMgr.h
+2 -2
View File
@@ -1238,8 +1238,8 @@ class SpellMgr
bool IsSkillTypeSpell(uint32 spellId, SkillType type) const; bool IsSkillTypeSpell(uint32 spellId, SkillType type) const;
static int32 CalculateSpellEffectAmount(SpellEntry const * spellEntry, uint8 effIndex, Unit const * caster = NULL, int32 const * basePoints = NULL, Unit const * target = NULL); static int32 CalculateSpellEffectAmount(SpellEntry const * spellEntry, uint8 effIndex, Unit const * caster = NULL, int32 const * basePoints = NULL, Unit const * target = NULL);
static int32 CalculateSpellEffectBaseAmount(int32 value, SpellEntry const * spellEntry, uint8 effIndex); static int32 CalculateSpellEffectBaseAmount(int32 value, SpellEntry const * spellEntry, uint8 effIndex);
static float CalculateSpellEffectValueMultiplier(SpellEntry const * spellEntry, uint8 effIndex, Unit * caster, Spell const * spell = NULL); static float CalculateSpellEffectValueMultiplier(SpellEntry const * spellEntry, uint8 effIndex, Unit * caster, Spell * spell = NULL);
static float CalculateSpellEffectDamageMultiplier(SpellEntry const * spellEntry, uint8 effIndex, Unit * caster, Spell const * spell = NULL); static float CalculateSpellEffectDamageMultiplier(SpellEntry const * spellEntry, uint8 effIndex, Unit * caster, Spell * spell = NULL);
// Spell correctess for client using // Spell correctess for client using
static bool IsSpellValid(SpellEntry const * spellInfo, Player* pl = NULL, bool msg = true); static bool IsSpellValid(SpellEntry const * spellInfo, Player* pl = NULL, bool msg = true);