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

[8162] Fixed applying random enchantments to quest rewarded items.

Browse source 
Signed-off-by: ApoC <apoc@nymfe.net>
This commit is contained in:
ApoC 2009-07-11 20:38:34 +02:00
parent 45eda48693
commit 0dc7ea6cc2
2 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/game/Player.cpp
View file

@ -1642,7 +1642,7 @@ bool Player::TeleportTo(uint32 mapid, float x, float y, float z, float orientati
m_teleport_dest = WorldLocation(mapid, x, y, z, orientation); m_teleport_dest = WorldLocation(mapid, x, y, z, orientation);
SetFallInformation(0, z); SetFallInformation(0, z);
// code for finish transfer called in WorldSession::HandleMovementOpcodes() // code for finish transfer called in WorldSession::HandleMovementOpcodes()
// at client packet MSG_MOVE_TELEPORT_ACK // at client packet MSG_MOVE_TELEPORT_ACK
SetSemaphoreTeleportNear(true); SetSemaphoreTeleportNear(true);
// near teleport, triggering send MSG_MOVE_TELEPORT_ACK from client at landing // near teleport, triggering send MSG_MOVE_TELEPORT_ACK from client at landing
@ -5569,7 +5569,7 @@ ActionButton* Player::addActionButton(uint8 button, uint32 action, uint8 type)
} }
// it create new button (NEW state) if need or return existed // it create new button (NEW state) if need or return existed
ActionButton& ab = m_actionButtons[button]; ActionButton& ab = m_actionButtons[button];
// set data and update to CHANGED if not NEW // set data and update to CHANGED if not NEW
@ -12540,12 +12540,12 @@ void Player::RewardQuest( Quest const *pQuest, uint32 reward, Object* questGiver
if (pQuest->GetRewChoiceItemsCount() > 0) if (pQuest->GetRewChoiceItemsCount() > 0)
{ {
if (pQuest->RewChoiceItemId[reward]) if (uint32 itemId = pQuest->RewChoiceItemId[reward])
{ {
ItemPosCountVec dest; ItemPosCountVec dest;
if (CanStoreNewItem( NULL_BAG, NULL_SLOT, dest, pQuest->RewChoiceItemId[reward], pQuest->RewChoiceItemCount[reward] ) == EQUIP_ERR_OK) if (CanStoreNewItem( NULL_BAG, NULL_SLOT, dest, itemId, pQuest->RewChoiceItemCount[reward] ) == EQUIP_ERR_OK)
{ {
Item* item = StoreNewItem( dest, pQuest->RewChoiceItemId[reward], true); Item* item = StoreNewItem( dest, itemId, true, Item::GenerateItemRandomPropertyId(itemId));
SendNewItem(item, pQuest->RewChoiceItemCount[reward], true, false); SendNewItem(item, pQuest->RewChoiceItemCount[reward], true, false);
} }
} }
@ -12555,12 +12555,12 @@ void Player::RewardQuest( Quest const *pQuest, uint32 reward, Object* questGiver
{ {
for (uint32 i=0; i < pQuest->GetRewItemsCount(); ++i) for (uint32 i=0; i < pQuest->GetRewItemsCount(); ++i)
{ {
if (pQuest->RewItemId[i]) if (uint32 itemId = pQuest->RewItemId[i])
{ {
ItemPosCountVec dest; ItemPosCountVec dest;
if (CanStoreNewItem( NULL_BAG, NULL_SLOT, dest, pQuest->RewItemId[i], pQuest->RewItemCount[i] ) == EQUIP_ERR_OK) if (CanStoreNewItem( NULL_BAG, NULL_SLOT, dest, itemId, pQuest->RewItemCount[i] ) == EQUIP_ERR_OK)
{ {
Item* item = StoreNewItem( dest, pQuest->RewItemId[i], true); Item* item = StoreNewItem( dest, itemId, true, Item::GenerateItemRandomPropertyId(itemId));
SendNewItem(item, pQuest->RewItemCount[i], true, false); SendNewItem(item, pQuest->RewItemCount[i], true, false);
} }
} }

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 "8161" #define REVISION_NR "8162"
#endif // __REVISION_NR_H__ #endif // __REVISION_NR_H__