Partial pick of 735606bc73 to fix compile

This commit is contained in:
Aokromes
2016-08-21 00:52:39 +02:00
parent 20f6b7bbb5
commit c68f48c9b3
4 changed files with 11 additions and 0 deletions

View File

@@ -59,6 +59,7 @@ DBCStorage <AreaPOIEntry> sAreaPOIStore(AreaPOIEntryfmt);
static WMOAreaInfoByTripple sWMOAreaInfoByTripple;
DBCStorage <AchievementEntry> sAchievementStore(Achievementfmt);
DBCStorage <AnimKitEntry> sAnimKitStore(AnimKitfmt);
DBCStorage <AchievementCriteriaEntry> sAchievementCriteriaStore(AchievementCriteriafmt);
DBCStorage <AreaTriggerEntry> sAreaTriggerStore(AreaTriggerEntryfmt);
DBCStorage <ArmorLocationEntry> sArmorLocationStore(ArmorLocationfmt);
@@ -342,6 +343,7 @@ void LoadDBCStores(const std::string& dataPath)
LoadDBC(availableDbcLocales, bad_dbc_files, sAreaTableStore, dbcPath, "AreaTable.dbc");
LoadDBC(availableDbcLocales, bad_dbc_files, sAchievementStore, dbcPath, "Achievement.dbc", &CustomAchievementfmt, &CustomAchievementIndex);//15595
LoadDBC(availableDbcLocales, bad_dbc_files, sAnimKitStore, dbcPath, "AnimKit.dbc");//15595
LoadDBC(availableDbcLocales, bad_dbc_files, sAchievementCriteriaStore, dbcPath, "Achievement_Criteria.dbc");//15595
LoadDBC(availableDbcLocales, bad_dbc_files, sAreaTriggerStore, dbcPath, "AreaTrigger.dbc");//15595
LoadDBC(availableDbcLocales, bad_dbc_files, sAreaGroupStore, dbcPath, "AreaGroup.dbc");//15595

View File

@@ -91,6 +91,7 @@ TC_GAME_API ResponseCodes ValidateName(std::string const& name, LocaleConstant l
TC_GAME_API EmotesTextSoundEntry const* FindTextSoundEmoteFor(uint32 emote, uint32 race, uint32 gender);
TC_GAME_API extern DBCStorage <AchievementEntry> sAchievementStore;
TC_GAME_API extern DBCStorage <AnimKitEntry> sAnimKitStore;
TC_GAME_API extern DBCStorage <AchievementCriteriaEntry> sAchievementCriteriaStore;
TC_GAME_API extern DBCStorage <AreaTableEntry> sAreaTableStore;
TC_GAME_API extern DBCStorage <AreaGroupEntry> sAreaGroupStore;

View File

@@ -596,6 +596,13 @@ struct AchievementCriteriaEntry
uint32 additionalConditionValue[MAX_ADDITIONAL_CRITERIA_CONDITIONS]; // 20-22
};
struct AnimKitEntry
uint32 ID; // 0
//uint32 OneShotDuration; // 1
//uint32 OneShotStopAnimKitID; // 2
//uint32 LowDefAnimKitID; // 3
};
struct AreaTableEntry
{
uint32 ID; // 0

View File

@@ -25,6 +25,7 @@
char const Achievementfmt[] = "niixsxiixixxii";
const std::string CustomAchievementfmt = "pppaaaapapaapp";
const std::string CustomAchievementIndex = "ID";
char const AnimKitfmt[] = "nxxx";
char const AchievementCriteriafmt[] = "niiiliiiisiiiiixxiiiiii";
char const AreaTableEntryfmt[] = "niiiixxxxxisiiiiiffixxxxxx";
char const AreaGroupEntryfmt[] = "niiiiiii";