diff options
| author | Subv <s.v.h21@hotmail.com> | 2012-12-27 07:09:28 -0800 |
|---|---|---|
| committer | Subv <s.v.h21@hotmail.com> | 2012-12-27 07:09:28 -0800 |
| commit | 3ee6ec258a3ccf3dfe1d74eec9adbf8bbc2843f6 (patch) | |
| tree | 7ddb7ae80d60940829ab894b1149f613bdb2bd06 /src | |
| parent | b81166651a279586146dedcab3cc09bc7e0dee77 (diff) | |
| parent | 978611d7ddc301d27c937574cc108f563b7cb73d (diff) | |
Merge pull request #8795 from Naios/db_dbc
[4.3.4] Core/DataStores: Upgraded spelldifficulty_dbc & achievement_dbc to 4.3.4
Diffstat (limited to 'src')
| -rw-r--r-- | src/server/game/DataStores/DBCStores.cpp | 4 | ||||
| -rw-r--r-- | src/server/game/DataStores/DBCfmt.h | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/server/game/DataStores/DBCStores.cpp b/src/server/game/DataStores/DBCStores.cpp index 8a647bacfea..c8f77d45922 100644 --- a/src/server/game/DataStores/DBCStores.cpp +++ b/src/server/game/DataStores/DBCStores.cpp @@ -325,7 +325,7 @@ void LoadDBCStores(const std::string& dataPath) } } - LoadDBC(availableDbcLocales, bad_dbc_files, sAchievementStore, dbcPath, "Achievement.dbc"/*, &CustomAchievementfmt, &CustomAchievementIndex*/);//14545 + LoadDBC(availableDbcLocales, bad_dbc_files, sAchievementStore, dbcPath, "Achievement.dbc", &CustomAchievementfmt, &CustomAchievementIndex);//14545 LoadDBC(availableDbcLocales, bad_dbc_files, sAchievementCriteriaStore, dbcPath, "Achievement_Criteria.dbc");//14545 LoadDBC(availableDbcLocales, bad_dbc_files, sAreaTriggerStore, dbcPath, "AreaTrigger.dbc");//14545 LoadDBC(availableDbcLocales, bad_dbc_files, sAreaGroupStore, dbcPath, "AreaGroup.dbc");//14545 @@ -514,7 +514,7 @@ void LoadDBCStores(const std::string& dataPath) LoadDBC(availableDbcLocales, bad_dbc_files, sSpellCategoriesStore, dbcPath,"SpellCategories.dbc");//14545 LoadDBC(availableDbcLocales, bad_dbc_files, sSpellEffectStore, dbcPath,"SpellEffect.dbc");//14545 LoadDBC(availableDbcLocales, bad_dbc_files, sSpellCastTimesStore, dbcPath, "SpellCastTimes.dbc");//14545 - LoadDBC(availableDbcLocales, bad_dbc_files, sSpellDifficultyStore, dbcPath, "SpellDifficulty.dbc"/*, &CustomSpellDifficultyfmt, &CustomSpellDifficultyIndex*/);//14545 + LoadDBC(availableDbcLocales, bad_dbc_files, sSpellDifficultyStore, dbcPath, "SpellDifficulty.dbc", &CustomSpellDifficultyfmt, &CustomSpellDifficultyIndex);//14545 LoadDBC(availableDbcLocales, bad_dbc_files, sSpellDurationStore, dbcPath, "SpellDuration.dbc");//14545 LoadDBC(availableDbcLocales, bad_dbc_files, sSpellFocusObjectStore, dbcPath, "SpellFocusObject.dbc");//14545 LoadDBC(availableDbcLocales, bad_dbc_files, sSpellItemEnchantmentStore, dbcPath, "SpellItemEnchantment.dbc");//14545 diff --git a/src/server/game/DataStores/DBCfmt.h b/src/server/game/DataStores/DBCfmt.h index 23f6798328f..599122d9eee 100644 --- a/src/server/game/DataStores/DBCfmt.h +++ b/src/server/game/DataStores/DBCfmt.h @@ -23,8 +23,8 @@ // n - index (included), l - bool, p - field present in sql dbc, a - field absent in sql dbc char const Achievementfmt[]="niixsxiixixxii"; -//const std::string CustomAchievementfmt="pppaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaapapaaaaaaaaaaaaaaaaaapp"; -//const std::string CustomAchievementIndex = "ID"; +const std::string CustomAchievementfmt="pppaaaapapaapp"; +const std::string CustomAchievementIndex = "ID"; char const AchievementCriteriafmt[]="niiiiiiiisiiiiixxiiiiii"; char const AreaTableEntryfmt[]="iiinixxxxxisiiiiifxxxxxxxx"; char const AreaGroupEntryfmt[]="niiiiiii"; |