From 68fceee10e6eede180ca444a2a7f2af2fe4ba5dc Mon Sep 17 00:00:00 2001 From: Shauren Date: Sat, 21 Feb 2015 13:08:33 +0100 Subject: Core/Spells: Removed leftovers of old cooldown handling * Use ItemEffect.db2 data directly instead of copying it to another structure --- src/server/game/DataStores/DB2Structure.h | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'src/server/game/DataStores') 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 -- cgit v1.2.3