diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/server/game/Entities/Conversation/Conversation.cpp | 1 | ||||
| -rw-r--r-- | src/server/game/Globals/ConversationDataStore.cpp | 3 | ||||
| -rw-r--r-- | src/server/game/Globals/ConversationDataStore.h | 1 |
3 files changed, 4 insertions, 1 deletions
diff --git a/src/server/game/Entities/Conversation/Conversation.cpp b/src/server/game/Entities/Conversation/Conversation.cpp index e3edba75986..527bc6636dd 100644 --- a/src/server/game/Entities/Conversation/Conversation.cpp +++ b/src/server/game/Entities/Conversation/Conversation.cpp @@ -197,6 +197,7 @@ void Conversation::Create(ObjectGuid::LowType lowGuid, uint32 conversationEntry, lineField.UiCameraID = line->UiCameraID; lineField.ActorIndex = line->ActorIdx; lineField.Flags = line->Flags; + lineField.ChatType = line->ChatType; ConversationLineEntry const* convoLine = sConversationLineStore.LookupEntry(line->Id); // never null for conversationTemplate->Lines diff --git a/src/server/game/Globals/ConversationDataStore.cpp b/src/server/game/Globals/ConversationDataStore.cpp index 9f3b4949bbc..f133f97eddd 100644 --- a/src/server/game/Globals/ConversationDataStore.cpp +++ b/src/server/game/Globals/ConversationDataStore.cpp @@ -36,7 +36,7 @@ void ConversationDataStore::LoadConversationTemplates() std::unordered_map<uint32, std::vector<ConversationActorTemplate>> actorsByConversation; - if (QueryResult lineTemplates = WorldDatabase.Query("SELECT Id, UiCameraID, ActorIdx, Flags FROM conversation_line_template")) + if (QueryResult lineTemplates = WorldDatabase.Query("SELECT Id, UiCameraID, ActorIdx, Flags, ChatType FROM conversation_line_template")) { uint32 oldMSTime = getMSTime(); @@ -57,6 +57,7 @@ void ConversationDataStore::LoadConversationTemplates() conversationLine.UiCameraID = fields[1].GetUInt32(); conversationLine.ActorIdx = fields[2].GetUInt8(); conversationLine.Flags = fields[3].GetUInt8(); + conversationLine.ChatType = fields[4].GetUInt8(); } while (lineTemplates->NextRow()); diff --git a/src/server/game/Globals/ConversationDataStore.h b/src/server/game/Globals/ConversationDataStore.h index cd1f81a6969..ed8bec144f3 100644 --- a/src/server/game/Globals/ConversationDataStore.h +++ b/src/server/game/Globals/ConversationDataStore.h @@ -71,6 +71,7 @@ struct ConversationLineTemplate uint32 UiCameraID; // Link to UiCamera.db2 uint8 ActorIdx; // Index from conversation_actors uint8 Flags; + uint8 ChatType; }; struct ConversationTemplate |