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

[7728] Use correct loot_type values in data sent to client instead long time existed hacks. Code cleanups. Author: VladimirMangos

Browse Source 
Thanks to Seizerkiller and TOM_RUS for help in reseach.

--HG--
branch : trunk
This commit is contained in:
megamage
2009-04-27 21:29:01 -05:00
parent 031c1b484c
commit bd4c2bdb64
2 changed files with 49 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/game/Player.cpp
+33 -60
View File
@@ -7215,12 +7215,6 @@ void Player::RemovedInsignia(Player* looterPlr)
looterPlr->SendLoot(bones->GetGUID(), LOOT_INSIGNIA); looterPlr->SendLoot(bones->GetGUID(), LOOT_INSIGNIA);
} }
/*Loot type MUST be
1-corpse, go
2-skinning
3-Fishing
*/
void Player::SendLootRelease( uint64 guid ) void Player::SendLootRelease( uint64 guid )
{ {
WorldPacket data( SMSG_LOOT_RELEASE_RESPONSE, (8+1) ); WorldPacket data( SMSG_LOOT_RELEASE_RESPONSE, (8+1) );
@@ -7252,7 +7246,7 @@ void Player::SendLoot(uint64 guid, LootType loot_type)
loot = &go->loot; loot = &go->loot;
if(go->getLootState() == GO_READY) if (go->getLootState() == GO_READY)
{ {
uint32 lootid = go->GetLootId(); uint32 lootid = go->GetLootId();
@@ -7266,14 +7260,14 @@ void Player::SendLoot(uint64 guid, LootType loot_type)
return; return;
} }
if(lootid) if (lootid)
{ {
sLog.outDebug(" if(lootid)"); sLog.outDebug(" if(lootid)");
loot->clear(); loot->clear();
loot->FillLoot(lootid, LootTemplates_Gameobject, this, false); loot->FillLoot(lootid, LootTemplates_Gameobject, this, false);
} }
if(loot_type == LOOT_FISHING) if (loot_type == LOOT_FISHING)
go->getFishLoot(loot,this); go->getFishLoot(loot,this);
go->SetLootState(GO_ACTIVATED); go->SetLootState(GO_ACTIVATED);
@@ -7289,50 +7283,28 @@ void Player::SendLoot(uint64 guid, LootType loot_type)
return; return;
} }
if(loot_type == LOOT_DISENCHANTING)
{
loot = &item->loot; loot = &item->loot;
if(!item->m_lootGenerated) if (!item->m_lootGenerated)
{ {
item->m_lootGenerated = true; item->m_lootGenerated = true;
loot->clear(); loot->clear();
switch(loot_type)
{
case LOOT_DISENCHANTING:
loot->FillLoot(item->GetProto()->DisenchantID, LootTemplates_Disenchant, this,true); loot->FillLoot(item->GetProto()->DisenchantID, LootTemplates_Disenchant, this,true);
} break;
} case LOOT_PROSPECTING:
else if(loot_type == LOOT_PROSPECTING)
{
loot = &item->loot;
if(!item->m_lootGenerated)
{
item->m_lootGenerated = true;
loot->clear();
loot->FillLoot(item->GetEntry(), LootTemplates_Prospecting, this,true); loot->FillLoot(item->GetEntry(), LootTemplates_Prospecting, this,true);
} break;
} case LOOT_MILLING:
else if(loot_type == LOOT_MILLING)
{
loot = &item->loot;
if(!item->m_lootGenerated)
{
item->m_lootGenerated = true;
loot->clear();
loot->FillLoot(item->GetEntry(), LootTemplates_Milling, this,true); loot->FillLoot(item->GetEntry(), LootTemplates_Milling, this,true);
} break;
} default:
else
{
loot = &item->loot;
if(!item->m_lootGenerated)
{
item->m_lootGenerated = true;
loot->clear();
loot->FillLoot(item->GetEntry(), LootTemplates_Item, this,true); loot->FillLoot(item->GetEntry(), LootTemplates_Item, this,true);
loot->generateMoneyLoot(item->GetProto()->MinMoneyLoot,item->GetProto()->MaxMoneyLoot); loot->generateMoneyLoot(item->GetProto()->MinMoneyLoot,item->GetProto()->MaxMoneyLoot);
break;
} }
} }
} }
@@ -7374,7 +7346,7 @@ void Player::SendLoot(uint64 guid, LootType loot_type)
return; return;
} }
if(loot_type == LOOT_PICKPOCKETING && IsFriendlyTo(creature)) if (loot_type == LOOT_PICKPOCKETING && IsFriendlyTo(creature))
{ {
SendLootRelease(guid); SendLootRelease(guid);
return; return;
@@ -7382,9 +7354,9 @@ void Player::SendLoot(uint64 guid, LootType loot_type)
loot = &creature->loot; loot = &creature->loot;
if(loot_type == LOOT_PICKPOCKETING) if (loot_type == LOOT_PICKPOCKETING)
{ {
if ( !creature->lootForPickPocketed ) if (!creature->lootForPickPocketed)
{ {
creature->lootForPickPocketed = true; creature->lootForPickPocketed = true;
loot->clear(); loot->clear();
@@ -7414,7 +7386,7 @@ void Player::SendLoot(uint64 guid, LootType loot_type)
loot->clear(); loot->clear();
} }
if(!creature->lootForBody) if (!creature->lootForBody)
{ {
creature->lootForBody = true; creature->lootForBody = true;
loot->clear(); loot->clear();
@@ -7424,7 +7396,7 @@ void Player::SendLoot(uint64 guid, LootType loot_type)
loot->generateMoneyLoot(creature->GetCreatureInfo()->mingold,creature->GetCreatureInfo()->maxgold); loot->generateMoneyLoot(creature->GetCreatureInfo()->mingold,creature->GetCreatureInfo()->maxgold);
if(Group* group = recipient->GetGroup()) if (Group* group = recipient->GetGroup())
{ {
group->UpdateLooterGuid(creature,true); group->UpdateLooterGuid(creature,true);
@@ -7457,13 +7429,13 @@ void Player::SendLoot(uint64 guid, LootType loot_type)
{ {
if(Group* group = GetGroup()) if(Group* group = GetGroup())
{ {
if( group == recipient->GetGroup() ) if (group == recipient->GetGroup())
{ {
if(group->GetLootMethod() == FREE_FOR_ALL) if (group->GetLootMethod() == FREE_FOR_ALL)
permission = ALL_PERMISSION; permission = ALL_PERMISSION;
else if(group->GetLooterGuid() == GetGUID()) else if (group->GetLooterGuid() == GetGUID())
{ {
if(group->GetLootMethod() == MASTER_LOOT) if (group->GetLootMethod() == MASTER_LOOT)
permission = MASTER_PERMISSION; permission = MASTER_PERMISSION;
else else
permission = ALL_PERMISSION; permission = ALL_PERMISSION;
@@ -7474,7 +7446,7 @@ void Player::SendLoot(uint64 guid, LootType loot_type)
else else
permission = NONE_PERMISSION; permission = NONE_PERMISSION;
} }
else if(recipient == this) else if (recipient == this)
permission = ALL_PERMISSION; permission = ALL_PERMISSION;
else else
permission = NONE_PERMISSION; permission = NONE_PERMISSION;
@@ -7484,12 +7456,13 @@ void Player::SendLoot(uint64 guid, LootType loot_type)
SetLootGUID(guid); SetLootGUID(guid);
// LOOT_PICKPOCKETING, LOOT_PROSPECTING, LOOT_DISENCHANTING, LOOT_INSIGNIA and LOOT_MILLING unsupported by client, sending LOOT_SKINNING instead // LOOT_INSIGNIA and LOOT_FISHINGHOLE unsupported by client
if(loot_type == LOOT_PICKPOCKETING || loot_type == LOOT_DISENCHANTING || loot_type == LOOT_PROSPECTING || loot_type == LOOT_INSIGNIA || loot_type == LOOT_MILLING) switch(loot_type)
loot_type = LOOT_SKINNING; {
case LOOT_INSIGNIA: loot_type = LOOT_SKINNING; break;
if(loot_type == LOOT_FISHINGHOLE) case LOOT_FISHINGHOLE: loot_type = LOOT_FISHING; break;
loot_type = LOOT_FISHING; default: break;
}
WorldPacket data(SMSG_LOOT_RESPONSE, (9+50)); // we guess size WorldPacket data(SMSG_LOOT_RESPONSE, (9+50)); // we guess size
@@ -7503,7 +7476,7 @@ void Player::SendLoot(uint64 guid, LootType loot_type)
if (permission != NONE_PERMISSION) if (permission != NONE_PERMISSION)
loot->AddLooter(GetGUID()); loot->AddLooter(GetGUID());
if ( loot_type == LOOT_CORPSE && !IS_ITEM_GUID(guid) ) if (loot_type == LOOT_CORPSE && !IS_ITEM_GUID(guid))
SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_LOOTING); SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_LOOTING);
} }
src/game/Player.h
+9 -7
View File
@@ -458,14 +458,16 @@ enum ActivateTaxiReplies
enum LootType enum LootType
{ {
LOOT_CORPSE = 1, LOOT_CORPSE = 1,
LOOT_SKINNING = 2, LOOT_PICKPOCKETING = 2,
LOOT_FISHING = 3, LOOT_FISHING = 3,
LOOT_PICKPOCKETING = 4, // unsupported by client, sending LOOT_SKINNING instead LOOT_DISENCHANTING = 4,
LOOT_DISENCHANTING = 5, // unsupported by client, sending LOOT_SKINNING instead // ignored always by client
LOOT_PROSPECTING = 6, // unsupported by client, sending LOOT_SKINNING instead LOOT_SKINNING = 6,
LOOT_INSIGNIA = 7, // unsupported by client, sending LOOT_SKINNING instead LOOT_PROSPECTING = 7,
LOOT_FISHINGHOLE = 8, // unsupported by client, sending LOOT_FISHING instead LOOT_MILLING = 8,
LOOT_MILLING = 9 // unsupported by client, sending LOOT_SKINNING instead
LOOT_FISHINGHOLE = 20, // unsupported by client, sending LOOT_FISHING instead
LOOT_INSIGNIA = 21 // unsupported by client, sending LOOT_CORPSE instead
}; };
enum MirrorTimerType enum MirrorTimerType