diff options
| author | XTZGZoReX <none@none> | 2009-03-20 15:17:58 +0100 |
|---|---|---|
| committer | XTZGZoReX <none@none> | 2009-03-20 15:17:58 +0100 |
| commit | d1adac0d11847c893b2df0778b81dbbbb79b20ee (patch) | |
| tree | bef465fd25746ed1e276ede2238f155b1a347a4a /src/shared/Database | |
| parent | 3c713189fb6ac6666e6d8e7faa2e1fec6b425725 (diff) | |
| parent | 4d7ee8208e0e1762ca70d1cee253e51d3c517551 (diff) | |
* Merge.
--HG--
branch : trunk
Diffstat (limited to 'src/shared/Database')
| -rw-r--r-- | src/shared/Database/DBCStores.cpp | 2 | ||||
| -rw-r--r-- | src/shared/Database/DBCStructure.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/shared/Database/DBCStores.cpp b/src/shared/Database/DBCStores.cpp index 001d0d5dc12..b15bb456945 100644 --- a/src/shared/Database/DBCStores.cpp +++ b/src/shared/Database/DBCStores.cpp @@ -337,7 +337,7 @@ void LoadDBCStores(const std::string& dataPath) LoadDBC(availableDbcLocales,bar,bad_dbc_files,sSpellRuneCostStore, dbcPath,"SpellRuneCost.dbc"); LoadDBC(availableDbcLocales,bar,bad_dbc_files,sSpellShapeshiftStore, dbcPath,"SpellShapeshiftForm.dbc"); LoadDBC(availableDbcLocales,bar,bad_dbc_files,sStableSlotPricesStore, dbcPath,"StableSlotPrices.dbc"); - //LoadDBC(availableDbcLocales,bar,bad_dbc_files,sSummonPropertiesStore, dbcPath,"SummonProperties.dbc"); + LoadDBC(availableDbcLocales,bar,bad_dbc_files,sSummonPropertiesStore, dbcPath,"SummonProperties.dbc"); LoadDBC(availableDbcLocales,bar,bad_dbc_files,sTalentStore, dbcPath,"Talent.dbc"); // create talent spells set diff --git a/src/shared/Database/DBCStructure.h b/src/shared/Database/DBCStructure.h index a511c97013c..6fb43567a3a 100644 --- a/src/shared/Database/DBCStructure.h +++ b/src/shared/Database/DBCStructure.h @@ -1401,7 +1401,7 @@ struct StableSlotPricesEntry struct SummonPropertiesEntry { uint32 Id; // 0 - uint32 Group; // 1, 0 - can't be controlled?, 1 - something guardian?, 2 - pet?, 3 - something controllable?, 4 - taxi/mount? + uint32 Category; // 1, 0 - can't be controlled?, 1 - something guardian?, 2 - pet?, 3 - something controllable?, 4 - taxi/mount? uint32 Unk2; // 2, 14 rows > 0 uint32 Type; // 3, see enum uint32 Slot; // 4, 0-6 |