aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sql/updates/world/2012_02_26_00_world_misc.sql13
-rwxr-xr-xsrc/server/game/DataStores/DBCStructure.h12
-rwxr-xr-xsrc/server/game/Miscellaneous/SharedDefines.h4
3 files changed, 21 insertions, 8 deletions
diff --git a/sql/updates/world/2012_02_26_00_world_misc.sql b/sql/updates/world/2012_02_26_00_world_misc.sql
new file mode 100644
index 00000000000..3df42934aa9
--- /dev/null
+++ b/sql/updates/world/2012_02_26_00_world_misc.sql
@@ -0,0 +1,13 @@
+UPDATE `spell_area` SET `quest_start`=12987,`quest_end`=12987 WHERE `spell`=56305;
+
+DELETE FROM `reference_loot_template` WHERE `entry` IN (28058,28074,28088,28064,28082,28096) AND `item`=49908; -- bad data
+DELETE FROM `gameobject_loot_template` WHERE `entry` IN (28058,28074,28088,28064,28082,28096) AND `item`=49908;
+INSERT INTO `gameobject_loot_template` (`entry`,`item`,`ChanceOrQuestChance`,`lootmode`,`groupid`,`mincountOrRef`,`maxcount`) VALUES
+-- Deathbringer's Cache
+(28058,49908,20,1,0,1,1), -- Primordial Saronite 10H
+(28074,49908,20,1,0,1,1), -- Primordial Saronite 25N
+(28088,49908,20,1,0,1,1), -- Primordial Saronite 25H
+-- Cache of the Dreamwalker
+(28064,49908,20,1,0,1,1), -- Primordial Saronite 10H
+(28082,49908,20,1,0,1,1), -- Primordial Saronite 25N
+(28096,49908,20,1,0,1,1); -- Primordial Saronite 25H
diff --git a/src/server/game/DataStores/DBCStructure.h b/src/server/game/DataStores/DBCStructure.h
index 75a6b71d943..1978dbc71f9 100755
--- a/src/server/game/DataStores/DBCStructure.h
+++ b/src/server/game/DataStores/DBCStructure.h
@@ -1066,14 +1066,18 @@ struct HolidayNamesEntry
};
*/
+#define MAX_HOLIDAY_DURATIONS 10
+#define MAX_HOLIDAY_DATES 26
+#define MAX_HOLIDAY_FLAGS 10
+
struct HolidaysEntry
{
uint32 Id; // 0 m_ID
- uint32 Duration[10]; // 1-10 m_duration (MAX_HOLIDAY_DURATIONS)
- uint32 Date[26]; // 11-36 m_date (dates in unix time starting at January, 1, 2000) (MAX_HOLIDAY_DATES)
+ uint32 Duration[MAX_HOLIDAY_DURATIONS]; // 1-10 m_duration
+ uint32 Date[MAX_HOLIDAY_DATES]; // 11-36 m_date (dates in unix time starting at January, 1, 2000)
uint32 Region; // 37 m_region (wow region)
uint32 Looping; // 38 m_looping
- uint32 CalendarFlags[10]; // 39-48 m_calendarFlags (MAX_HOLIDAY_FLAGS)
+ uint32 CalendarFlags[MAX_HOLIDAY_FLAGS]; // 39-48 m_calendarFlags
//uint32 holidayNameId; // 49 m_holidayNameID (HolidayNames.dbc)
//uint32 holidayDescriptionId; // 50 m_holidayDescriptionID (HolidayDescriptions.dbc)
char* TextureFilename; // 51 m_textureFilename
@@ -1086,7 +1090,7 @@ struct ItemEntry
{
uint32 ID; // 0
uint32 Class; // 1
- uint32 SubClass; // 2 some items have strnage subclasses
+ uint32 SubClass; // 2 some items have strange subclasses
int32 Unk0; // 3
int32 Material; // 4
uint32 DisplayId; // 5
diff --git a/src/server/game/Miscellaneous/SharedDefines.h b/src/server/game/Miscellaneous/SharedDefines.h
index 369b20252ab..c404277f61f 100755
--- a/src/server/game/Miscellaneous/SharedDefines.h
+++ b/src/server/game/Miscellaneous/SharedDefines.h
@@ -3424,10 +3424,6 @@ enum ActivateTaxiReply
// Calendar - start
-#define MAX_HOLIDAY_DATES 26
-#define MAX_HOLIDAY_FLAGS 10
-#define MAX_HOLIDAY_DURATIONS 10
-
enum CalendarFlags
{
CALENDAR_FLAG_ALL_ALLOWED = 0x001,