diff --git a/src/game/CalendarHandler.cpp b/src/game/CalendarHandler.cpp index c4ae0b74b..903aa759b 100644 --- a/src/game/CalendarHandler.cpp +++ b/src/game/CalendarHandler.cpp @@ -67,22 +67,22 @@ void WorldSession::HandleCalendarGetCalendar(WorldPacket &/*recv_data*/) /* for(uint32 i = 0; i < holidays_count; ++i) { - data << uint32(0); // holiday id - data << uint32(0); // Holidays.dbc field 37 (flags) - data << uint32(0); // Holidays.dbc field 38 (flags) - data << uint32(0); // Holidays.dbc field 52 - data << uint32(0); // Holidays.dbc field RepeatingMethod + data << uint32(0); // Holidays.dbc ID + data << uint32(0); // Holidays.dbc region + data << uint32(0); // Holidays.dbc looping + data << uint32(0); // Holidays.dbc priority + data << uint32(0); // Holidays.dbc calendarFilterType for(uint32 j = 0; j < 26; j++) - data << uint32(0); // Holidays.dbc field Dates + data << uint32(0); // Holidays.dbc date for(uint32 j = 0; j < 10; j++) - data << uint32(0); // Holidays.dbc field unk1 + data << uint32(0); // Holidays.dbc duration for(uint32 j = 0; j < 10; j++) - data << uint32(0); // Holidays.dbc field unk39 + data << uint32(0); // Holidays.dbc calendarFlags - data << ""; // Holidays.dbc field texture + data << ""; // Holidays.dbc textureFilename } */ //DEBUG_LOG("Sending calendar"); diff --git a/src/game/DBCStructure.h b/src/game/DBCStructure.h index 3ff4d7e28..927ca93e3 100644 --- a/src/game/DBCStructure.h +++ b/src/game/DBCStructure.h @@ -1025,17 +1025,17 @@ struct HolidayNamesEntry struct HolidaysEntry { uint32 ID; // 0 m_ID - //uint32 unk1[10]; // 1-10 m_duration - //uint32 Dates[26]; // 11-36 m_date (dates in unix time starting at January, 1, 2000) - //uint32 unk37; // 37 m_region (wow region) - //uint32 unk38; // 38 m_looping - //uint32 unk39[10]; // 39-48 m_calendarFlags + //uint32 duration[10]; // 1-10 m_duration + //uint32 date[26]; // 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 //uint32 holidayNameId; // 49 m_holidayNameID (HolidayNames.dbc) //uint32 holidayDescriptionId; // 50 m_holidayDescriptionID (HolidayDescriptions.dbc) - //char *texture; // 51 m_textureFilename - //uint32 unk52; // 52 m_priority - //uint32 RepeatingMethod; // 53 m_calendarFilterType (-1,0,1 or 2) - //uint32 unk54; // 54 m_flags + //char *textureFilename; // 51 m_textureFilename + //uint32 priority; // 52 m_priority + //uint32 calendarFilterType; // 53 m_calendarFilterType (-1,0,1 or 2) + //uint32 flags; // 54 m_flags }; struct ItemEntry