diff options
Diffstat (limited to 'src/game/GroupHandler.cpp')
| -rw-r--r-- | src/game/GroupHandler.cpp | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/src/game/GroupHandler.cpp b/src/game/GroupHandler.cpp index fab192bbedc..f8bdc008e51 100644 --- a/src/game/GroupHandler.cpp +++ b/src/game/GroupHandler.cpp @@ -96,7 +96,7 @@ void WorldSession::HandleGroupInviteOpcode( WorldPacket & recv_data ) return; } // just ignore us - if(player->GetInstanceId() != 0 && player->GetDifficulty() != GetPlayer()->GetDifficulty()) + if(player->GetInstanceId() != 0 && player->GetDungeonDifficulty() != GetPlayer()->GetDungeonDifficulty()) { SendPartyResult(PARTY_OP_INVITE, membername, PARTY_RESULT_TARGET_IGNORE_YOU); return; @@ -386,10 +386,10 @@ void WorldSession::HandleLootRoll( WorldPacket &recv_data ) uint64 Guid; uint32 NumberOfPlayers; - uint8 Choise; + uint8 rollType; recv_data >> Guid; //guid of the item rolled recv_data >> NumberOfPlayers; - recv_data >> Choise; //0: pass, 1: need, 2: greed + recv_data >> rollType; //0: pass, 1: need, 2: greed //sLog.outDebug("WORLD RECIEVE CMSG_LOOT_ROLL, From:%u, Numberofplayers:%u, Choise:%u", (uint32)Guid, NumberOfPlayers, Choise); @@ -398,14 +398,14 @@ void WorldSession::HandleLootRoll( WorldPacket &recv_data ) return; // everything's fine, do it - group->CountRollVote(GetPlayer()->GetGUID(), Guid, NumberOfPlayers, Choise); + group->CountRollVote(GetPlayer()->GetGUID(), Guid, NumberOfPlayers, rollType); - switch (Choise) + switch (rollType) { - case 1: + case ROLL_NEED: GetPlayer()->GetAchievementMgr().UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_ROLL_NEED, 1); break; - case 2: + case ROLL_GREED: GetPlayer()->GetAchievementMgr().UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_ROLL_GREED, 1); break; } @@ -919,4 +919,3 @@ void WorldSession::HandleOptOutOfLootOpcode( WorldPacket & recv_data ) if(unkn!=0) sLog.outError("CMSG_GROUP_PASS_ON_LOOT: activation not implemented!"); } - |