aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/server/game/Entities/Creature/GossipDef.cpp6
-rw-r--r--src/server/game/Entities/Creature/GossipDef.h2
-rw-r--r--src/server/game/Entities/Player/Player.cpp2
-rw-r--r--src/server/game/Server/Packets/QuestPackets.cpp8
-rw-r--r--src/server/game/Server/Packets/QuestPackets.h12
5 files changed, 15 insertions, 15 deletions
diff --git a/src/server/game/Entities/Creature/GossipDef.cpp b/src/server/game/Entities/Creature/GossipDef.cpp
index 48411ad870c..d19e9c19a0e 100644
--- a/src/server/game/Entities/Creature/GossipDef.cpp
+++ b/src/server/game/Entities/Creature/GossipDef.cpp
@@ -331,9 +331,9 @@ void QuestMenu::ClearMenu()
_questMenuItems.clear();
}
-void PlayerMenu::SendQuestGiverQuestList(ObjectGuid guid)
+void PlayerMenu::SendQuestGiverQuestListMessage(ObjectGuid guid)
{
- WorldPackets::Quest::QuestGiverQuestList questList;
+ WorldPackets::Quest::QuestGiverQuestListMessage questList;
questList.QuestGiverGUID = guid;
if (QuestGreeting const* questGreeting = sObjectMgr->GetQuestGreeting(guid))
@@ -368,7 +368,7 @@ void PlayerMenu::SendQuestGiverQuestList(ObjectGuid guid)
bool repeatable = false; // NYI
- questList.GossipTexts.emplace_back(questID, questMenuItem.QuestIcon, quest->GetQuestLevel(), quest->GetFlags(), quest->GetFlagsEx(), repeatable, title);
+ questList.QuestDataText.emplace_back(questID, questMenuItem.QuestIcon, quest->GetQuestLevel(), quest->GetFlags(), quest->GetFlagsEx(), repeatable, title);
}
}
diff --git a/src/server/game/Entities/Creature/GossipDef.h b/src/server/game/Entities/Creature/GossipDef.h
index 66b009a92ef..b3e58081400 100644
--- a/src/server/game/Entities/Creature/GossipDef.h
+++ b/src/server/game/Entities/Creature/GossipDef.h
@@ -259,7 +259,7 @@ class TC_GAME_API PlayerMenu
/*********************************************************/
void SendQuestGiverStatus(uint32 questStatus, ObjectGuid npcGUID) const;
- void SendQuestGiverQuestList(ObjectGuid npcGUID);
+ void SendQuestGiverQuestListMessage(ObjectGuid npcGUID);
void SendQuestQueryResponse(Quest const* quest) const;
void SendQuestGiverQuestDetails(Quest const* quest, ObjectGuid npcGUID, bool activateAccept) const;
diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp
index 3fbf3f4f4f6..351f75b47e7 100644
--- a/src/server/game/Entities/Player/Player.cpp
+++ b/src/server/game/Entities/Player/Player.cpp
@@ -14605,7 +14605,7 @@ void Player::SendPreparedQuest(ObjectGuid guid)
}
}
- PlayerTalkClass->SendQuestGiverQuestList(guid);
+ PlayerTalkClass->SendQuestGiverQuestListMessage(guid);
}
bool Player::IsActiveQuest(uint32 quest_id) const
diff --git a/src/server/game/Server/Packets/QuestPackets.cpp b/src/server/game/Server/Packets/QuestPackets.cpp
index 1492dc7e35e..32f9da96a1b 100644
--- a/src/server/game/Server/Packets/QuestPackets.cpp
+++ b/src/server/game/Server/Packets/QuestPackets.cpp
@@ -475,20 +475,20 @@ void WorldPackets::Quest::QuestLogRemoveQuest::Read()
_worldPacket >> Entry;
}
-WorldPacket const* WorldPackets::Quest::QuestGiverQuestList::Write()
+WorldPacket const* WorldPackets::Quest::QuestGiverQuestListMessage::Write()
{
_worldPacket << QuestGiverGUID;
_worldPacket << uint32(GreetEmoteDelay);
_worldPacket << uint32(GreetEmoteType);
- _worldPacket << uint32(GossipTexts.size());
+ _worldPacket << uint32(QuestDataText.size());
_worldPacket.WriteBits(Greeting.size(), 11);
_worldPacket.FlushBits();
- for (GossipTextData const& gossip : GossipTexts)
+ for (GossipText const& gossip : QuestDataText)
{
_worldPacket << uint32(gossip.QuestID);
_worldPacket << uint32(gossip.QuestType);
- _worldPacket << uint32(gossip.QuestLevel);
+ _worldPacket << int32(gossip.QuestLevel);
_worldPacket << uint32(gossip.QuestFlags);
_worldPacket << uint32(gossip.QuestFlagsEx);
_worldPacket.WriteBit(gossip.Repeatable);
diff --git a/src/server/game/Server/Packets/QuestPackets.h b/src/server/game/Server/Packets/QuestPackets.h
index 241771961a7..8c26d14f466 100644
--- a/src/server/game/Server/Packets/QuestPackets.h
+++ b/src/server/game/Server/Packets/QuestPackets.h
@@ -460,30 +460,30 @@ namespace WorldPackets
uint8 Entry = 0;
};
- struct GossipTextData
+ struct GossipText
{
- GossipTextData(uint32 questID, uint32 questType, uint32 questLevel, uint32 questFlags, uint32 questFlagsEx, bool repeatable, std::string questTitle) :
+ GossipText(uint32 questID, uint32 questType, int32 questLevel, uint32 questFlags, uint32 questFlagsEx, bool repeatable, std::string questTitle) :
QuestID(questID), QuestType(questType), QuestLevel(questLevel), QuestFlags(questFlags), QuestFlagsEx(questFlagsEx), Repeatable(repeatable), QuestTitle(questTitle) { }
uint32 QuestID;
uint32 QuestType;
- uint32 QuestLevel;
+ int32 QuestLevel;
uint32 QuestFlags;
uint32 QuestFlagsEx;
bool Repeatable;
std::string QuestTitle;
};
- class QuestGiverQuestList final : public ServerPacket
+ class QuestGiverQuestListMessage final : public ServerPacket
{
public:
- QuestGiverQuestList() : ServerPacket(SMSG_QUEST_GIVER_QUEST_LIST_MESSAGE, 100) { }
+ QuestGiverQuestListMessage() : ServerPacket(SMSG_QUEST_GIVER_QUEST_LIST_MESSAGE, 100) { }
WorldPacket const* Write() override;
ObjectGuid QuestGiverGUID;
uint32 GreetEmoteDelay = 0;
uint32 GreetEmoteType = 0;
- std::vector<GossipTextData> GossipTexts;
+ std::vector<GossipText> QuestDataText;
std::string Greeting;
};