diff options
| author | Shauren <shauren.trinity@gmail.com> | 2016-07-20 13:27:04 +0200 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2016-07-20 13:27:04 +0200 |
| commit | e405ac5f4100cf9e544b80cf4503b107ecee8d50 (patch) | |
| tree | 155db121e093b757a215698639393841bbacb8f2 /src/server/game/DataStores | |
| parent | 420d096b6a477856979e2810a8f68d38cbce3349 (diff) | |
Fixed nopch build and some leftover warnings
Diffstat (limited to 'src/server/game/DataStores')
| -rw-r--r-- | src/server/game/DataStores/DB2Stores.cpp | 1 | ||||
| -rw-r--r-- | src/server/game/DataStores/DB2Stores.h | 4 | ||||
| -rw-r--r-- | src/server/game/DataStores/DBCEnums.h | 4 |
3 files changed, 4 insertions, 5 deletions
diff --git a/src/server/game/DataStores/DB2Stores.cpp b/src/server/game/DataStores/DB2Stores.cpp index 61d00eb8947..832ae6df726 100644 --- a/src/server/game/DataStores/DB2Stores.cpp +++ b/src/server/game/DataStores/DB2Stores.cpp @@ -614,7 +614,6 @@ void DB2Manager::LoadStores(std::string const& dataPath, uint32 defaultLocale) for (ItemModifiedAppearanceEntry const* appearanceMod : sItemModifiedAppearanceStore) { ASSERT(appearanceMod->ItemID <= 0xFFFFFF); - ASSERT(appearanceMod->AppearanceModID <= 0xFF); _itemModifiedAppearancesByItem[appearanceMod->ItemID | (appearanceMod->AppearanceModID << 24)] = appearanceMod; } diff --git a/src/server/game/DataStores/DB2Stores.h b/src/server/game/DataStores/DB2Stores.h index fdf3b744c4c..06ed6c724f2 100644 --- a/src/server/game/DataStores/DB2Stores.h +++ b/src/server/game/DataStores/DB2Stores.h @@ -22,7 +22,6 @@ #include "DB2Structure.h" #include "SharedDefines.h" #include <boost/regex.hpp> -#include <array> TC_GAME_API extern DB2Storage<AchievementEntry> sAchievementStore; TC_GAME_API extern DB2Storage<AnimKitEntry> sAnimKitStore; @@ -191,9 +190,6 @@ typedef std::map<uint32, TaxiPathSetForSource> TaxiPathSetBySource; typedef std::vector<TaxiPathNodeEntry const*> TaxiPathNodeList; typedef std::vector<TaxiPathNodeList> TaxiPathNodesByPath; -#define TaxiMaskSize 236 -typedef std::array<uint8, TaxiMaskSize> TaxiMask; - TC_GAME_API extern TaxiMask sTaxiNodesMask; TC_GAME_API extern TaxiMask sOldContinentsNodesMask; TC_GAME_API extern TaxiMask sHordeTaxiNodesMask; diff --git a/src/server/game/DataStores/DBCEnums.h b/src/server/game/DataStores/DBCEnums.h index 3159039d6cd..b1b3b6e6a12 100644 --- a/src/server/game/DataStores/DBCEnums.h +++ b/src/server/game/DataStores/DBCEnums.h @@ -20,6 +20,7 @@ #define DBCENUMS_H #include "Define.h" +#include <array> #pragma pack(push, 1) @@ -710,6 +711,9 @@ enum SpellProcsPerMinuteModType SPELL_PPM_MOD_BATTLEGROUND = 7 }; +#define TaxiMaskSize 236 +typedef std::array<uint8, TaxiMaskSize> TaxiMask; + enum TotemCategoryType { TOTEM_CATEGORY_TYPE_KNIFE = 1, |