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

*Fix reading spell target code.

Browse Source 
--HG--
branch : trunk
This commit is contained in:
megamage
2009-03-14 15:12:57 -06:00
parent 2490a3e250
commit 39186b5b10
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/game/Spell.cpp
+9 -4
View File
@@ -177,6 +177,8 @@ bool SpellCastTargets::read ( WorldPacket * data, Unit *caster )
if(data->rpos()+4 > data->size()) if(data->rpos()+4 > data->size())
return false; return false;
//data->hexlike();
*data >> m_targetMask; *data >> m_targetMask;
sLog.outDebug("Spell read, target mask = %u", m_targetMask); sLog.outDebug("Spell read, target mask = %u", m_targetMask);
@@ -200,7 +202,7 @@ bool SpellCastTargets::read ( WorldPacket * data, Unit *caster )
if(!data->readPackGUID(m_CorpseTargetGUID)) if(!data->readPackGUID(m_CorpseTargetGUID))
return false; return false;
/*if( m_targetMask & TARGET_FLAG_SOURCE_LOCATION ) if( m_targetMask & TARGET_FLAG_SOURCE_LOCATION )
{ {
if(data->rpos()+4+4+4 > data->size()) if(data->rpos()+4+4+4 > data->size())
return false; return false;
@@ -208,9 +210,11 @@ bool SpellCastTargets::read ( WorldPacket * data, Unit *caster )
*data >> m_srcX >> m_srcY >> m_srcZ; *data >> m_srcX >> m_srcY >> m_srcZ;
if(!Trinity::IsValidMapCoord(m_srcX, m_srcY, m_srcZ)) if(!Trinity::IsValidMapCoord(m_srcX, m_srcY, m_srcZ))
return false; return false;
}*/
if( m_targetMask & (TARGET_FLAG_SOURCE_LOCATION | TARGET_FLAG_DEST_LOCATION) ) m_hasDest = true;
}
if( m_targetMask & TARGET_FLAG_DEST_LOCATION )
{ {
if(data->rpos()+1+4+4+4 > data->size()) if(data->rpos()+1+4+4+4 > data->size())
return false; return false;
@@ -219,9 +223,10 @@ bool SpellCastTargets::read ( WorldPacket * data, Unit *caster )
return false; return false;
*data >> m_destX >> m_destY >> m_destZ; *data >> m_destX >> m_destY >> m_destZ;
m_hasDest = true;
if(!Trinity::IsValidMapCoord(m_destX, m_destY, m_destZ)) if(!Trinity::IsValidMapCoord(m_destX, m_destY, m_destZ))
return false; return false;
m_hasDest = true;
} }
if( m_targetMask & TARGET_FLAG_STRING ) if( m_targetMask & TARGET_FLAG_STRING )