Inna/CypherCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Core/Quest: Corrected type of emote field in QuestOfferReward to be signed

Browse Source 
Port From (https://github.com/TrinityCore/TrinityCore/commit/27931b45c681f7f84928bad557882350731df3dc)
This commit is contained in:
hondacrx
2022-07-19 12:17:41 -04:00
parent 0302d9b1df
commit 0a3ea6ac48
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Game/Entities/Creature/Gossip.cs
+1 -1
View File
@@ -529,7 +529,7 @@ namespace Game.Misc
offer.SuggestedPartyMembers = quest.SuggestedPlayers; offer.SuggestedPartyMembers = quest.SuggestedPlayers;
for (uint i = 0; i < SharedConst.QuestEmoteCount && quest.OfferRewardEmote[i] != 0; ++i) for (uint i = 0; i < SharedConst.QuestEmoteCount && quest.OfferRewardEmote[i] != 0; ++i)
offer.Emotes.Add(new QuestDescEmote(quest.OfferRewardEmote[i], quest.OfferRewardEmoteDelay[i])); offer.Emotes.Add(new QuestDescEmote((uint)quest.OfferRewardEmote[i], quest.OfferRewardEmoteDelay[i]));
offer.QuestFlags[0] = (uint)quest.Flags; offer.QuestFlags[0] = (uint)quest.Flags;
offer.QuestFlags[1] = (uint)quest.FlagsEx; offer.QuestFlags[1] = (uint)quest.FlagsEx;
Source/Game/Quest/Quest.cs
+2 -2
View File
@@ -195,7 +195,7 @@ namespace Game
{ {
for (int i = 0; i < SharedConst.QuestEmoteCount; ++i) for (int i = 0; i < SharedConst.QuestEmoteCount; ++i)
{ {
ushort emoteId = fields.Read<ushort>(1 + i); short emoteId = fields.Read<short>(1 + i);
if (!CliDB.EmotesStorage.ContainsKey(emoteId)) if (!CliDB.EmotesStorage.ContainsKey(emoteId))
{ {
Log.outError(LogFilter.Sql, "Table `quest_offer_reward` has non-existing Emote{0} ({1}) set for quest {2}. Skipped.", 1 + i, emoteId, fields.Read<uint>(0)); Log.outError(LogFilter.Sql, "Table `quest_offer_reward` has non-existing Emote{0} ({1}) set for quest {2}. Skipped.", 1 + i, emoteId, fields.Read<uint>(0));
@@ -756,7 +756,7 @@ namespace Game
public string RequestItemsText = ""; public string RequestItemsText = "";
// quest_offer_reward table // quest_offer_reward table
public uint[] OfferRewardEmote = new uint[SharedConst.QuestEmoteCount]; public int[] OfferRewardEmote = new int[SharedConst.QuestEmoteCount];
public uint[] OfferRewardEmoteDelay = new uint[SharedConst.QuestEmoteCount]; public uint[] OfferRewardEmoteDelay = new uint[SharedConst.QuestEmoteCount];
public string OfferRewardText = ""; public string OfferRewardText = "";