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

Some 308 changes

Browse source
This commit is contained in:
tomrus88 2008-12-26 14:21:42 +03:00
parent 5eddba260e
commit a38078d0c2
3 changed files with 69 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

57
src/game/AddonHandler.cpp
View file

@ -80,47 +80,68 @@ bool AddonHandler::BuildAddonPacket(WorldPacket *Source, WorldPacket *Target)
{ {
Target->Initialize(SMSG_ADDON_INFO); Target->Initialize(SMSG_ADDON_INFO);
while(AddOnPacked.rpos() < AddOnPacked.size()) uint32 addonsCount;
AddOnPacked >> addonsCount; // addons count?
for(uint32 i = 0; i < addonsCount; ++i)
{ {
std::string AddonNames; std::string addonName;
uint8 unk6; uint8 enabled;
uint32 crc, unk7; uint32 crc, unk2;
// check next addon data format correctness // check next addon data format correctness
if(AddOnPacked.rpos()+1+4+4+1 > AddOnPacked.size()) if(AddOnPacked.rpos()+1 > AddOnPacked.size())
return false; return false;
AddOnPacked >> AddonNames; AddOnPacked >> addonName;
// recheck next addon data format correctness // recheck next addon data format correctness
if(AddOnPacked.rpos()+4+4+1 > AddOnPacked.size()) if(AddOnPacked.rpos()+1+4+4 > AddOnPacked.size())
return false; return false;
AddOnPacked >> crc >> unk7 >> unk6; AddOnPacked >> enabled >> crc >> unk2;
//sLog.outDebug("ADDON: Name:%s CRC:%x Unknown1 :%x Unknown2 :%x", AddonNames.c_str(), crc, unk7, unk6); sLog.outDebug("ADDON: Name: %s, Enabled: 0x%x, CRC: 0x%x, Unknown2: 0x%x", addonName.c_str(), enabled, crc, unk2);
*Target << (uint8)2; uint8 state = (enabled ? 2 : 1);
*Target << uint8(state);
uint8 unk1 = 1; uint8 unk1 = (enabled ? 1 : 0);
*Target << (uint8)unk1; *Target << uint8(unk1);
if (unk1) if (unk1)
{ {
uint8 unk2 = crc != 0x1c776d01LL; //If addon is Standard addon CRC uint8 unk2 = (crc != 0x4c1c776d); // If addon is Standard addon CRC
*Target << (uint8)unk2; *Target << uint8(unk2);
if (unk2) if (unk2)
Target->append(tdata, sizeof(tdata)); Target->append(tdata, sizeof(tdata));
*Target << (uint32)0; *Target << uint32(0);
} }
uint8 unk3 = 0; uint8 unk3 = (enabled ? 0 : 1);
*Target << (uint8)unk3; *Target << uint8(unk3);
if (unk3) if (unk3)
{ {
// String, 256 // String, 256 (null terminated?)
*Target << uint8(0);
} }
} }
uint32 unk4;
AddOnPacked >> unk4;
uint32 count = 0;
*Target << uint32(count);
/*for(uint32 i = 0; i < count; ++i)
{
uint32
string (16 bytes)
string (16 bytes)
uint32
}*/
if(AddOnPacked.rpos() != AddOnPacked.size())
sLog.outDebug("packet under read!");
} }
else else
{ {

10
src/game/GossipDef.cpp
View file

@ -593,11 +593,17 @@ void PlayerMenu::SendQuestQueryResponse( Quest const *pQuest )
data << uint32(pQuest->ReqCreatureOrGOId[iI]); data << uint32(pQuest->ReqCreatureOrGOId[iI]);
} }
data << uint32(pQuest->ReqCreatureOrGOCount[iI]); data << uint32(pQuest->ReqCreatureOrGOCount[iI]);
data << uint32(pQuest->ReqItemId[iI]); //data << uint32(pQuest->ReqItemId[iI]);
data << uint32(pQuest->ReqItemCount[iI]); //data << uint32(pQuest->ReqItemCount[iI]);
data << uint32(0); // added in WotLK, dunno if offset if correct data << uint32(0); // added in WotLK, dunno if offset if correct
} }
for (iI = 0; iI < 5; ++iI) // items?
{
data << uint32(0);
data << uint32(0);
}
for (iI = 0; iI < QUEST_OBJECTIVES_COUNT; iI++) for (iI = 0; iI < QUEST_OBJECTIVES_COUNT; iI++)
data << ObjectiveText[iI]; data << ObjectiveText[iI];

26
src/game/Spell.cpp
View file

@ -170,7 +170,7 @@ bool SpellCastTargets::read ( WorldPacket * data, Unit *caster )
if(!readGUID(*data, m_unitTargetGUID)) if(!readGUID(*data, m_unitTargetGUID))
return false; return false;
if( m_targetMask & ( TARGET_FLAG_OBJECT | TARGET_FLAG_OBJECT_UNK )) if( m_targetMask & ( TARGET_FLAG_OBJECT ))
if(!readGUID(*data, m_GOTargetGUID)) if(!readGUID(*data, m_GOTargetGUID))
return false; return false;
@ -178,6 +178,10 @@ bool SpellCastTargets::read ( WorldPacket * data, Unit *caster )
if(!readGUID(*data, m_itemTargetGUID)) if(!readGUID(*data, m_itemTargetGUID))
return false; return false;
if( m_targetMask & (TARGET_FLAG_CORPSE | TARGET_FLAG_PVP_CORPSE ) )
if(!readGUID(*data, m_CorpseTargetGUID))
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())
@ -190,7 +194,10 @@ bool SpellCastTargets::read ( WorldPacket * data, Unit *caster )
if( m_targetMask & TARGET_FLAG_DEST_LOCATION ) if( m_targetMask & TARGET_FLAG_DEST_LOCATION )
{ {
if(data->rpos()+4+4+4 > data->size()) if(data->rpos()+1+4+4+4 > data->size())
return false;
if(!readGUID(*data, m_unitTargetGUID))
return false; return false;
*data >> m_destX >> m_destY >> m_destZ; *data >> m_destX >> m_destY >> m_destZ;
@ -206,10 +213,6 @@ bool SpellCastTargets::read ( WorldPacket * data, Unit *caster )
*data >> m_strTarget; *data >> m_strTarget;
} }
if( m_targetMask & (TARGET_FLAG_CORPSE | TARGET_FLAG_PVP_CORPSE ) )
if(!readGUID(*data, m_CorpseTargetGUID))
return false;
// find real units/GOs // find real units/GOs
Update(caster); Update(caster);
return true; return true;
@ -219,7 +222,7 @@ void SpellCastTargets::write ( WorldPacket * data )
{ {
*data << uint32(m_targetMask); *data << uint32(m_targetMask);
if( m_targetMask & ( TARGET_FLAG_UNIT | TARGET_FLAG_PVP_CORPSE | TARGET_FLAG_OBJECT | TARGET_FLAG_OBJECT_UNK | TARGET_FLAG_CORPSE | TARGET_FLAG_UNK2 ) ) if( m_targetMask & ( TARGET_FLAG_UNIT | TARGET_FLAG_PVP_CORPSE | TARGET_FLAG_OBJECT | TARGET_FLAG_CORPSE | TARGET_FLAG_UNK2 ) )
{ {
if(m_targetMask & TARGET_FLAG_UNIT) if(m_targetMask & TARGET_FLAG_UNIT)
{ {
@ -228,7 +231,7 @@ void SpellCastTargets::write ( WorldPacket * data )
else else
*data << uint8(0); *data << uint8(0);
} }
else if( m_targetMask & ( TARGET_FLAG_OBJECT | TARGET_FLAG_OBJECT_UNK ) ) else if( m_targetMask & TARGET_FLAG_OBJECT )
{ {
if(m_GOTarget) if(m_GOTarget)
data->append(m_GOTarget->GetPackGUID()); data->append(m_GOTarget->GetPackGUID());
@ -253,7 +256,14 @@ void SpellCastTargets::write ( WorldPacket * data )
*data << m_srcX << m_srcY << m_srcZ; *data << m_srcX << m_srcY << m_srcZ;
if( m_targetMask & TARGET_FLAG_DEST_LOCATION ) if( m_targetMask & TARGET_FLAG_DEST_LOCATION )
{
if(m_unitTarget)
data->append(m_unitTarget->GetPackGUID());
else
*data << uint8(0);
*data << m_destX << m_destY << m_destZ; *data << m_destX << m_destY << m_destZ;
}
if( m_targetMask & TARGET_FLAG_STRING ) if( m_targetMask & TARGET_FLAG_STRING )
*data << m_strTarget; *data << m_strTarget;