Core/DB: Rename SoundEntriesID to SoundKitID in BroadcastText
Port From (https://github.com/TrinityCore/TrinityCore/commit/a54c51c362426613be658e4a471b8fc866e82d57)
This commit is contained in:
@@ -187,8 +187,8 @@ namespace Framework.Database
|
|||||||
" FROM battlemaster_list_locale WHERE locale = ?");
|
" FROM battlemaster_list_locale WHERE locale = ?");
|
||||||
|
|
||||||
// BroadcastText.db2
|
// BroadcastText.db2
|
||||||
PrepareStatement(HotfixStatements.SEL_BROADCAST_TEXT, "SELECT Text, Text1, ID, LanguageID, ConditionID, EmotesID, Flags, ChatBubbleDurationMs, " +
|
PrepareStatement(HotfixStatements.SEL_BROADCAST_TEXT, "SELECT Text, Text1, ID, LanguageID, ConditionID, EmotesID, Flags, ChatBubbleDurationMs, " +
|
||||||
"SoundEntriesID1, SoundEntriesID2, EmoteID1, EmoteID2, EmoteID3, EmoteDelay1, EmoteDelay2, EmoteDelay3 FROM broadcast_text");
|
"SoundKitID1, SoundKitID2, EmoteID1, EmoteID2, EmoteID3, EmoteDelay1, EmoteDelay2, EmoteDelay3 FROM broadcast_text");
|
||||||
PrepareStatement(HotfixStatements.SEL_BROADCAST_TEXT_LOCALE, "SELECT ID, Text_lang, Text1_lang FROM broadcast_text_locale WHERE locale = ?");
|
PrepareStatement(HotfixStatements.SEL_BROADCAST_TEXT_LOCALE, "SELECT ID, Text_lang, Text1_lang FROM broadcast_text_locale WHERE locale = ?");
|
||||||
|
|
||||||
// BroadcastTextDuration.db2
|
// BroadcastTextDuration.db2
|
||||||
|
|||||||
@@ -117,7 +117,7 @@ namespace Game.DataStorage
|
|||||||
public ushort EmotesID;
|
public ushort EmotesID;
|
||||||
public byte Flags;
|
public byte Flags;
|
||||||
public uint ChatBubbleDurationMs;
|
public uint ChatBubbleDurationMs;
|
||||||
public uint[] SoundEntriesID = new uint[2];
|
public uint[] SoundKitID = new uint[2];
|
||||||
public ushort[] EmoteID = new ushort[3];
|
public ushort[] EmoteID = new ushort[3];
|
||||||
public ushort[] EmoteDelay = new ushort[3];
|
public ushort[] EmoteDelay = new ushort[3];
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -213,7 +213,7 @@ namespace Game
|
|||||||
BroadcastTextRecord bct = CliDB.BroadcastTextStorage.LookupByKey(textEntry.BroadcastTextId);
|
BroadcastTextRecord bct = CliDB.BroadcastTextStorage.LookupByKey(textEntry.BroadcastTextId);
|
||||||
if (bct != null)
|
if (bct != null)
|
||||||
{
|
{
|
||||||
uint broadcastTextSoundId = bct.SoundEntriesID[source.GetGender() == Gender.Female ? 1 : 0];
|
uint broadcastTextSoundId = bct.SoundKitID[source.GetGender() == Gender.Female ? 1 : 0];
|
||||||
if (broadcastTextSoundId != 0)
|
if (broadcastTextSoundId != 0)
|
||||||
finalSound = broadcastTextSoundId;
|
finalSound = broadcastTextSoundId;
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user