diff options
| author | Shauren <shauren.trinity@gmail.com> | 2021-03-14 01:05:32 +0100 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2021-03-14 01:05:32 +0100 |
| commit | c15cf8b424be0cf60150fbc7ddaf4574f78d72fd (patch) | |
| tree | ace55c4f925c7b985d4385e6aed33231c85c3a67 /src | |
| parent | 3addbe7dd418259149c39fc3b9423f7809de696a (diff) | |
Core/AdventureJournal: Fix broken hotfix database structure from 3addbe7dd418259149c39fc3b9423f7809de696a
Diffstat (limited to 'src')
| -rw-r--r-- | src/server/database/Database/Implementation/HotfixDatabase.cpp | 4 | ||||
| -rw-r--r-- | src/server/game/DataStores/DB2LoadInfo.h | 18 | ||||
| -rw-r--r-- | src/server/game/DataStores/DB2Structure.h | 2 |
3 files changed, 12 insertions, 12 deletions
diff --git a/src/server/database/Database/Implementation/HotfixDatabase.cpp b/src/server/database/Database/Implementation/HotfixDatabase.cpp index 227cb119562..9b354df9c84 100644 --- a/src/server/database/Database/Implementation/HotfixDatabase.cpp +++ b/src/server/database/Database/Implementation/HotfixDatabase.cpp @@ -45,8 +45,8 @@ void HotfixDatabaseConnection::DoPrepareStatements() // AdventureJournal.db2 PrepareStatement(HOTFIX_SEL_ADVENTURE_JOURNAL, "SELECT ID, Name, Description, ButtonText, RewardDescription, ContinueDescription, Type, " - "PlayerConditionId, Flags, ButtonActionType, TextureFileDataId, LfgDungeonId, QuestId, BattleMasterListId, PriorityMin, PriorityMax, ItemId, " - "ItemQuantity, CurrencyType, CurrencyQuantity, UiMapId, BonusPlayerConditionId1, BonusPlayerConditionId2, BonusValue1, BonusValue2" + "PlayerConditionID, Flags, ButtonActionType, TextureFileDataID, LfgDungeonID, QuestID, BattleMasterListID, PriorityMin, PriorityMax, ItemID, " + "ItemQuantity, CurrencyType, CurrencyQuantity, UiMapID, BonusPlayerConditionID1, BonusPlayerConditionID2, BonusValue1, BonusValue2" " FROM adventure_journal WHERE (`VerifiedBuild` > 0) = ?", CONNECTION_SYNCH); PREPARE_MAX_ID_STMT(HOTFIX_SEL_ADVENTURE_JOURNAL, "SELECT MAX(ID) + 1 FROM adventure_journal", CONNECTION_SYNCH); PREPARE_LOCALE_STMT(HOTFIX_SEL_ADVENTURE_JOURNAL, "SELECT ID, Name_lang, Description_lang, ButtonText_lang, RewardDescription_lang, " diff --git a/src/server/game/DataStores/DB2LoadInfo.h b/src/server/game/DataStores/DB2LoadInfo.h index 1e1b95b98f5..1e6a7be3926 100644 --- a/src/server/game/DataStores/DB2LoadInfo.h +++ b/src/server/game/DataStores/DB2LoadInfo.h @@ -66,22 +66,22 @@ struct AdventureJournalLoadInfo { false, FT_STRING, "RewardDescription" }, { false, FT_STRING, "ContinueDescription" }, { false, FT_BYTE, "Type" }, - { false, FT_INT, "PlayerConditionId" }, + { false, FT_INT, "PlayerConditionID" }, { false, FT_BYTE, "Flags" }, { false, FT_BYTE, "ButtonActionType" }, - { true, FT_INT, "TextureFileDataId" }, - { false, FT_SHORT, "LfgDungeonId" }, - { true, FT_INT, "QuestId" }, - { false, FT_SHORT, "BattleMasterListId" }, + { true, FT_INT, "TextureFileDataID" }, + { false, FT_SHORT, "LfgDungeonID" }, + { true, FT_INT, "QuestID" }, + { false, FT_SHORT, "BattleMasterListID" }, { false, FT_BYTE, "PriorityMin" }, { false, FT_BYTE, "PriorityMax" }, - { true, FT_INT, "ItemId" }, + { true, FT_INT, "ItemID" }, { false, FT_INT, "ItemQuantity" }, { false, FT_SHORT, "CurrencyType" }, { false, FT_INT, "CurrencyQuantity" }, - { false, FT_SHORT, "UiMapId" }, - { false, FT_INT, "BonusPlayerConditionId1" }, - { false, FT_INT, "BonusPlayerConditionId2" }, + { false, FT_SHORT, "UiMapID" }, + { false, FT_INT, "BonusPlayerConditionID1" }, + { false, FT_INT, "BonusPlayerConditionID2" }, { false, FT_BYTE, "BonusValue1" }, { false, FT_BYTE, "BonusValue2" }, }; diff --git a/src/server/game/DataStores/DB2Structure.h b/src/server/game/DataStores/DB2Structure.h index bebc686f461..aa88e0fc7b4 100644 --- a/src/server/game/DataStores/DB2Structure.h +++ b/src/server/game/DataStores/DB2Structure.h @@ -69,7 +69,7 @@ struct AdventureJournalEntry uint16 CurrencyType; uint32 CurrencyQuantity; uint16 UiMapID; - int32 BonusPlayerConditionID[2]; + uint32 BonusPlayerConditionID[2]; uint8 BonusValue[2]; }; |