aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorModoX <moardox@gmail.com>2022-07-19 06:25:23 +0200
committerModoX <moardox@gmail.com>2022-07-19 06:27:02 +0200
commit27931b45c681f7f84928bad557882350731df3dc (patch)
tree8e493cd6e4823b8d0232b9cc0aa1eef16004de4f
parente9152679d78c456e05be3743d7fed308c8304555 (diff)
Core/Quest: Corrected type of emote field in QuestOfferReward to be signed
-rw-r--r--sql/updates/world/master/2022_07_19_00_world.sql5
-rw-r--r--src/server/game/Quests/QuestDef.cpp2
-rw-r--r--src/server/game/Quests/QuestDef.h2
3 files changed, 7 insertions, 2 deletions
diff --git a/sql/updates/world/master/2022_07_19_00_world.sql b/sql/updates/world/master/2022_07_19_00_world.sql
new file mode 100644
index 00000000000..e78ec905e90
--- /dev/null
+++ b/sql/updates/world/master/2022_07_19_00_world.sql
@@ -0,0 +1,5 @@
+--
+ALTER TABLE `quest_offer_reward` MODIFY COLUMN `Emote1` smallint NOT NULL DEFAULT 0 AFTER `ID`;
+ALTER TABLE `quest_offer_reward` MODIFY COLUMN `Emote2` smallint NOT NULL DEFAULT 0 AFTER `Emote1`;
+ALTER TABLE `quest_offer_reward` MODIFY COLUMN `Emote3` smallint NOT NULL DEFAULT 0 AFTER `Emote2`;
+ALTER TABLE `quest_offer_reward` MODIFY COLUMN `Emote4` smallint NOT NULL DEFAULT 0 AFTER `Emote3`;
diff --git a/src/server/game/Quests/QuestDef.cpp b/src/server/game/Quests/QuestDef.cpp
index fd4d505655b..f04d4dd2255 100644
--- a/src/server/game/Quests/QuestDef.cpp
+++ b/src/server/game/Quests/QuestDef.cpp
@@ -200,7 +200,7 @@ void Quest::LoadQuestOfferReward(Field* fields)
continue;
}
- OfferRewardEmote[i] = fields[1 + i].GetUInt16();
+ OfferRewardEmote[i] = fields[1 + i].GetInt16();
}
for (uint32 i = 0; i < QUEST_EMOTE_COUNT; ++i)
diff --git a/src/server/game/Quests/QuestDef.h b/src/server/game/Quests/QuestDef.h
index c4f6132deb4..0310dcee50a 100644
--- a/src/server/game/Quests/QuestDef.h
+++ b/src/server/game/Quests/QuestDef.h
@@ -630,7 +630,7 @@ class TC_GAME_API Quest
QuestObjectives Objectives;
std::array<uint32, QUEST_EMOTE_COUNT> DetailsEmote = { };
std::array<uint32, QUEST_EMOTE_COUNT> DetailsEmoteDelay = { };
- std::array<uint32, QUEST_EMOTE_COUNT> OfferRewardEmote = { };
+ std::array<int32, QUEST_EMOTE_COUNT> OfferRewardEmote = { };
std::array<uint32, QUEST_EMOTE_COUNT> OfferRewardEmoteDelay = { };
uint32 GetRewChoiceItemsCount() const { return _rewChoiceItemsCount; }