aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorfunjoker <funjoker109@gmail.com>2021-11-03 12:05:43 +0100
committerfunjoker <funjoker109@gmail.com>2021-11-03 12:05:43 +0100
commita54c51c362426613be658e4a471b8fc866e82d57 (patch)
tree585a232bbe5d8e5d4a6b65211b387a174f62777c
parent1e52f9fdf566320fd586127692c5a1c16e34f741 (diff)
Core/DB: Rename SoundEntriesID to SoundKitID in BroadcastText
This is the correct naming
-rw-r--r--sql/updates/hotfixes/master/2021_11_03_01_hotfixes.sql1
-rw-r--r--src/server/database/Database/Implementation/HotfixDatabase.cpp2
-rw-r--r--src/server/game/DataStores/DB2LoadInfo.h4
-rw-r--r--src/server/game/DataStores/DB2Structure.h2
-rw-r--r--src/server/game/Texts/CreatureTextMgr.cpp2
5 files changed, 6 insertions, 5 deletions
diff --git a/sql/updates/hotfixes/master/2021_11_03_01_hotfixes.sql b/sql/updates/hotfixes/master/2021_11_03_01_hotfixes.sql
new file mode 100644
index 00000000000..99f61b89416
--- /dev/null
+++ b/sql/updates/hotfixes/master/2021_11_03_01_hotfixes.sql
@@ -0,0 +1 @@
+ALTER TABLE `broadcast_text` CHANGE COLUMN `SoundEntriesID1` `SoundKitID1` INT(10) UNSIGNED NOT NULL DEFAULT '0' AFTER `ChatBubbleDurationMs`, CHANGE COLUMN `SoundEntriesID2` `SoundKitID2` INT(10) UNSIGNED NOT NULL DEFAULT '0' AFTER `SoundKitID1`;
diff --git a/src/server/database/Database/Implementation/HotfixDatabase.cpp b/src/server/database/Database/Implementation/HotfixDatabase.cpp
index 62f83dbc5ad..8116811bf29 100644
--- a/src/server/database/Database/Implementation/HotfixDatabase.cpp
+++ b/src/server/database/Database/Implementation/HotfixDatabase.cpp
@@ -270,7 +270,7 @@ void HotfixDatabaseConnection::DoPrepareStatements()
// BroadcastText.db2
PrepareStatement(HOTFIX_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"
" WHERE (`VerifiedBuild` > 0) = ?", CONNECTION_SYNCH);
PREPARE_MAX_ID_STMT(HOTFIX_SEL_BROADCAST_TEXT, "SELECT MAX(ID) + 1 FROM broadcast_text", CONNECTION_SYNCH);
PREPARE_LOCALE_STMT(HOTFIX_SEL_BROADCAST_TEXT, "SELECT ID, Text_lang, Text1_lang FROM broadcast_text_locale WHERE (`VerifiedBuild` > 0) = ?"
diff --git a/src/server/game/DataStores/DB2LoadInfo.h b/src/server/game/DataStores/DB2LoadInfo.h
index 8efaf33a3c6..28a8a929d55 100644
--- a/src/server/game/DataStores/DB2LoadInfo.h
+++ b/src/server/game/DataStores/DB2LoadInfo.h
@@ -876,8 +876,8 @@ struct BroadcastTextLoadInfo
{ false, FT_SHORT, "EmotesID" },
{ false, FT_BYTE, "Flags" },
{ false, FT_INT, "ChatBubbleDurationMs" },
- { false, FT_INT, "SoundEntriesID1" },
- { false, FT_INT, "SoundEntriesID2" },
+ { false, FT_INT, "SoundKitID1" },
+ { false, FT_INT, "SoundKitID2" },
{ false, FT_SHORT, "EmoteID1" },
{ false, FT_SHORT, "EmoteID2" },
{ false, FT_SHORT, "EmoteID3" },
diff --git a/src/server/game/DataStores/DB2Structure.h b/src/server/game/DataStores/DB2Structure.h
index 30629f3147a..992c5d78d06 100644
--- a/src/server/game/DataStores/DB2Structure.h
+++ b/src/server/game/DataStores/DB2Structure.h
@@ -527,7 +527,7 @@ struct BroadcastTextEntry
uint16 EmotesID;
uint8 Flags;
uint32 ChatBubbleDurationMs;
- uint32 SoundEntriesID[2];
+ uint32 SoundKitID[2];
uint16 EmoteID[MAX_BROADCAST_TEXT_EMOTES];
uint16 EmoteDelay[MAX_BROADCAST_TEXT_EMOTES];
};
diff --git a/src/server/game/Texts/CreatureTextMgr.cpp b/src/server/game/Texts/CreatureTextMgr.cpp
index 754b66f45d1..9c80391d551 100644
--- a/src/server/game/Texts/CreatureTextMgr.cpp
+++ b/src/server/game/Texts/CreatureTextMgr.cpp
@@ -215,7 +215,7 @@ uint32 CreatureTextMgr::SendChat(Creature* source, uint8 textGroup, WorldObject
finalPlayType = playType;
}
else if (BroadcastTextEntry const* bct = sBroadcastTextStore.LookupEntry(iter->BroadcastTextId))
- if (uint32 broadcastTextSoundId = bct->SoundEntriesID[source->getGender() == GENDER_FEMALE ? 1 : 0])
+ if (uint32 broadcastTextSoundId = bct->SoundKitID[source->getGender() == GENDER_FEMALE ? 1 : 0])
finalSound = broadcastTextSoundId;
if (range == TEXT_RANGE_NORMAL)