diff options
| author | Shauren <shauren.trinity@gmail.com> | 2015-08-13 00:38:36 +0200 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2015-08-13 00:38:36 +0200 |
| commit | 57624e0d53b8a39574454e5fb7f196b807088ae4 (patch) | |
| tree | 475f50df0b4e785c7b62619d4784d77dc99e81be | |
| parent | b81a136c3a6c8651909290aee3df0b800106844c (diff) | |
Core/DataStores: Updated Mount.db2 structure
Closes #15113
| -rw-r--r-- | src/server/game/DataStores/DB2Stores.cpp | 2 | ||||
| -rw-r--r-- | src/server/game/DataStores/DB2Structure.h | 2 | ||||
| -rw-r--r-- | src/server/game/DataStores/DB2fmt.h | 2 | ||||
| -rw-r--r-- | src/server/shared/Database/Implementation/HotfixDatabase.cpp | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/src/server/game/DataStores/DB2Stores.cpp b/src/server/game/DataStores/DB2Stores.cpp index 50cdc816e42..9a9a8250248 100644 --- a/src/server/game/DataStores/DB2Stores.cpp +++ b/src/server/game/DataStores/DB2Stores.cpp @@ -801,6 +801,6 @@ bool DB2Manager::GlyphSlotEntryComparator::Compare(GlyphSlotEntry const* left, G bool DB2Manager::MountTypeXCapabilityEntryComparator::Compare(MountTypeXCapabilityEntry const* left, MountTypeXCapabilityEntry const* right) { if (left->MountTypeID == right->MountTypeID) - return left->OrderIndex > right->OrderIndex; + return left->OrderIndex < right->OrderIndex; return left->ID < right->ID; } diff --git a/src/server/game/DataStores/DB2Structure.h b/src/server/game/DataStores/DB2Structure.h index c84996a524e..0e5142e8bdf 100644 --- a/src/server/game/DataStores/DB2Structure.h +++ b/src/server/game/DataStores/DB2Structure.h @@ -688,6 +688,7 @@ struct MailTemplateEntry struct MountEntry { uint32 Id; + uint32 SpellId; uint32 MountTypeId; uint32 DisplayId; uint32 Flags; @@ -695,7 +696,6 @@ struct MountEntry LocalizedString* Description; LocalizedString* SourceDescription; uint32 Source; - uint32 SpellId; uint32 PlayerConditionId; }; diff --git a/src/server/game/DataStores/DB2fmt.h b/src/server/game/DataStores/DB2fmt.h index b7f3356176e..0bca88cf265 100644 --- a/src/server/game/DataStores/DB2fmt.h +++ b/src/server/game/DataStores/DB2fmt.h @@ -73,7 +73,7 @@ char const ItemXBonusTreeFormat[] = "nii"; char const KeyChainFormat[] = "nbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb"; char const MailTemplateFormat[] = "ns"; char const MountCapabilityFormat[] = "niiiiiii"; -char const MountFormat[] = "niiisssiii"; +char const MountFormat[] = "niiiisssii"; char const MountTypeXCapabilityFormat[] = "niii"; char const NameGenFormat[] = "nsii"; char const OverrideSpellDataFormat[] = "niiiiiiiiiiii"; diff --git a/src/server/shared/Database/Implementation/HotfixDatabase.cpp b/src/server/shared/Database/Implementation/HotfixDatabase.cpp index be2ff140fd8..c037f1bce70 100644 --- a/src/server/shared/Database/Implementation/HotfixDatabase.cpp +++ b/src/server/shared/Database/Implementation/HotfixDatabase.cpp @@ -276,7 +276,7 @@ void HotfixDatabaseConnection::DoPrepareStatements() PREPARE_LOCALE_STMT(HOTFIX_SEL_MAIL_TEMPLATE, "SELECT ID, Body_lang FROM mail_template_locale WHERE locale = ?", CONNECTION_SYNCH); // Mount.db2 - PrepareStatement(HOTFIX_SEL_MOUNT, "SELECT Id, MountTypeId, DisplayId, Flags, Name, Description, SourceDescription, Source, SpellId, " + PrepareStatement(HOTFIX_SEL_MOUNT, "SELECT Id, SpellId, MountTypeId, DisplayId, Flags, Name, Description, SourceDescription, Source, " "PlayerConditionId FROM mount ORDER BY Id DESC", CONNECTION_SYNCH); PREPARE_LOCALE_STMT(HOTFIX_SEL_MOUNT, "SELECT Id, Name_lang, Description_lang, SourceDescription_lang FROM mount_locale WHERE locale = ?", CONNECTION_SYNCH); |