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

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

Browse source 
Thanks to Seizerkiller and TOM_RUS for help in reseach.
This commit is contained in:
VladimirMangos 2009-04-27 21:19:51 +04:00
parent 9ab8c6edd3
commit 5b9e46edea
3 changed files with 51 additions and 76 deletions
Download patch file Download diff file Expand all files Collapse all files

109
src/game/Player.cpp
View file

@ -1134,7 +1134,7 @@ void Player::Update( uint32 p_time )
if (hasUnitState(UNIT_STAT_MELEE_ATTACKING)) if (hasUnitState(UNIT_STAT_MELEE_ATTACKING))
{ {
Unit *pVictim = getVictim(); Unit *pVictim = getVictim();
if( !IsNonMeleeSpellCasted(false) && pVictim) if (pVictim && !IsNonMeleeSpellCasted(false))
{ {
// default combat reach 10 // default combat reach 10
// TODO add weapon,skill check // TODO add weapon,skill check
@ -7083,12 +7083,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) );
@ -7120,18 +7114,18 @@ 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();
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);
@ -7147,50 +7141,28 @@ void Player::SendLoot(uint64 guid, LootType loot_type)
return; return;
} }
if(loot_type == LOOT_DISENCHANTING) loot = &item->loot;
if (!item->m_lootGenerated)
{ {
loot = &item->loot; item->m_lootGenerated = true;
loot->clear();
if(!item->m_lootGenerated) switch(loot_type)
{ {
item->m_lootGenerated = true; case LOOT_DISENCHANTING:
loot->clear(); loot->FillLoot(item->GetProto()->DisenchantID, LootTemplates_Disenchant, this,true);
loot->FillLoot(item->GetProto()->DisenchantID, LootTemplates_Disenchant, this,true); break;
} case LOOT_PROSPECTING:
} loot->FillLoot(item->GetEntry(), LootTemplates_Prospecting, this,true);
else if(loot_type == LOOT_PROSPECTING) break;
{ case LOOT_MILLING:
loot = &item->loot; loot->FillLoot(item->GetEntry(), LootTemplates_Milling, this,true);
break;
if(!item->m_lootGenerated) default:
{ loot->FillLoot(item->GetEntry(), LootTemplates_Item, this,true);
item->m_lootGenerated = true; loot->generateMoneyLoot(item->GetProto()->MinMoneyLoot,item->GetProto()->MaxMoneyLoot);
loot->clear(); break;
loot->FillLoot(item->GetEntry(), LootTemplates_Prospecting, this,true);
}
}
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);
}
}
else
{
loot = &item->loot;
if(!item->m_lootGenerated)
{
item->m_lootGenerated = true;
loot->clear();
loot->FillLoot(item->GetEntry(), LootTemplates_Item, this,true);
loot->generateMoneyLoot(item->GetProto()->MinMoneyLoot,item->GetProto()->MaxMoneyLoot);
} }
} }
} }
@ -7230,7 +7202,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;
@ -7238,9 +7210,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();
@ -7270,7 +7242,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();
@ -7280,7 +7252,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);
@ -7313,13 +7285,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;
@ -7330,7 +7302,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;
@ -7340,12 +7312,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
@ -7359,7 +7332,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);
} }

16
src/game/Player.h
View file

@ -460,14 +460,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

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 "7727" #define REVISION_NR "7728"
#endif // __REVISION_NR_H__ #endif // __REVISION_NR_H__