aboutsummaryrefslogtreecommitdiff
path: root/src/server/game/DataStores
diff options
context:
space:
mode:
authorShauren <shauren.trinity@gmail.com>2015-02-21 13:08:33 +0100
committerShauren <shauren.trinity@gmail.com>2015-02-21 13:08:33 +0100
commit68fceee10e6eede180ca444a2a7f2af2fe4ba5dc (patch)
tree5797248d23c302502f304c1f3614d8aaa6f08172 /src/server/game/DataStores
parent6ff1764084d9234f35609a227567875cd95561a1 (diff)
Core/Spells: Removed leftovers of old cooldown handling
* Use ItemEffect.db2 data directly instead of copying it to another structure
Diffstat (limited to 'src/server/game/DataStores')
-rw-r--r--src/server/game/DataStores/DB2Structure.h18
1 files changed, 9 insertions, 9 deletions
diff --git a/src/server/game/DataStores/DB2Structure.h b/src/server/game/DataStores/DB2Structure.h
index be0ee1b9e75..30044aed5ce 100644
--- a/src/server/game/DataStores/DB2Structure.h
+++ b/src/server/game/DataStores/DB2Structure.h
@@ -64,7 +64,7 @@ struct HolidaysEntry
uint32 CalendarFlags[MAX_HOLIDAY_FLAGS]; // 29-38
//uint32 HolidayNameID; // 39 HolidayNames.dbc
//uint32 HolidayDescriptionID; // 40 HolidayDescriptions.dbc
- char* TextureFilename; // 41
+ LocalizedString* TextureFilename; // 41
uint32 Priority; // 42
uint32 CalendarFilterType; // 43 (-1 = Fishing Contest, 0 = Unk, 1 = Darkmoon Festival, 2 = Yearly holiday)
//uint32 Flags; // 44 (0 = Darkmoon Faire, Fishing Contest and Wotlk Launch, rest is 1)
@@ -389,14 +389,14 @@ struct SpellTotemsEntry
struct TaxiNodesEntry
{
- uint32 ID; // 0
- uint32 MapID; // 1
- DBCPosition3D Pos; // 2-4
- char* Name_lang; // 5
- uint32 MountCreatureID[2]; // 6-7
- uint32 ConditionID; // 8
- uint32 Flags; // 9
- float MapOffset[2]; // 10-11
+ uint32 ID; // 0
+ uint32 MapID; // 1
+ DBCPosition3D Pos; // 2-4
+ LocalizedString* Name_lang; // 5
+ uint32 MountCreatureID[2]; // 6-7
+ uint32 ConditionID; // 8
+ uint32 Flags; // 9
+ float MapOffset[2]; // 10-11
};
struct TaxiPathEntry