Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-23 10:26:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

Core/Calendar: Holiday.dbc -> SMSG_CALENDAR_SEND_CALENDAR

Browse Source
This commit is contained in:
Nay
2012-02-25 05:28:22 +00:00
parent ad78d44da8
commit 0f1bd50ae0
3 changed files with 33 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/server/game/DataStores/DBCStructure.h
View File

@@ -1068,17 +1068,17 @@ struct HolidayNamesEntry
struct HolidaysEntry struct HolidaysEntry
{ {
uint32 ID; // 0 m_ID uint32 Id; // 0 m_ID
//uint32 duration[10]; // 1-10 m_duration uint32 Duration[10]; // 1-10 m_duration
//uint32 date[26]; // 11-36 m_date (dates in unix time starting at January, 1, 2000) uint32 Date[26]; // 11-36 m_date (dates in unix time starting at January, 1, 2000)
//uint32 region; // 37 m_region (wow region) uint32 Region; // 37 m_region (wow region)
//uint32 looping; // 38 m_looping uint32 Looping; // 38 m_looping
//uint32 calendarFlags[10]; // 39-48 m_calendarFlags uint32 CalendarFlags[10]; // 39-48 m_calendarFlags
//uint32 holidayNameId; // 49 m_holidayNameID (HolidayNames.dbc) //uint32 holidayNameId; // 49 m_holidayNameID (HolidayNames.dbc)
//uint32 holidayDescriptionId; // 50 m_holidayDescriptionID (HolidayDescriptions.dbc) //uint32 holidayDescriptionId; // 50 m_holidayDescriptionID (HolidayDescriptions.dbc)
//char *textureFilename; // 51 m_textureFilename char* TextureFilename; // 51 m_textureFilename
//uint32 priority; // 52 m_priority uint32 Priority; // 52 m_priority
//uint32 calendarFilterType; // 53 m_calendarFilterType (-1 = Fishing Contest, 0 = Unk, 1 = Darkmoon Festival, 2 = Yearly holiday) uint32 CalendarFilterType; // 53 m_calendarFilterType (-1 = Fishing Contest, 0 = Unk, 1 = Darkmoon Festival, 2 = Yearly holiday)
//uint32 flags; // 54 m_flags (0 = Darkmoon Faire, Fishing Contest and Wotlk Launch, rest is 1) //uint32 flags; // 54 m_flags (0 = Darkmoon Faire, Fishing Contest and Wotlk Launch, rest is 1)
}; };

2
src/server/game/DataStores/DBCfmt.h
View File

@@ -67,7 +67,7 @@ const char GtOCTRegenHPfmt[]="f";
//const char GtOCTRegenMPfmt[]="f"; //const char GtOCTRegenMPfmt[]="f";
const char GtRegenHPPerSptfmt[]="f"; const char GtRegenHPPerSptfmt[]="f";
const char GtRegenMPPerSptfmt[]="f"; const char GtRegenMPPerSptfmt[]="f";
const char Holidaysfmt[]="nxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"; const char Holidaysfmt[]="niiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiixxsiix";
const char Itemfmt[]="niiiiiii"; const char Itemfmt[]="niiiiiii";
const char ItemBagFamilyfmt[]="nxxxxxxxxxxxxxxxxx"; const char ItemBagFamilyfmt[]="nxxxxxxxxxxxxxxxxx";
//const char ItemDisplayTemplateEntryfmt[]="nxxxxxxxxxxixxxxxxxxxxx"; //const char ItemDisplayTemplateEntryfmt[]="nxxxxxxxxxxixxxxxxxxxxx";

41
src/server/game/Handlers/CalendarHandler.cpp
View File

@@ -153,26 +153,31 @@ void WorldSession::HandleCalendarGetCalendar(WorldPacket& /*recvData*/)
data.put<uint32>(p_counter, counter); data.put<uint32>(p_counter, counter);
data << uint32(0); // holiday count?
/* // TODO: Fix this, how we do know how many and what holidays to send?
for (;;) uint32 holidayCount = 0;
data << uint32(holidayCount);
for (uint32 i = 0; i < holidayCount; ++i)
{ {
uint32 unk5, unk6, unk7, unk8, unk9; HolidaysEntry const* holiday = sHolidaysStore.LookupEntry(666);
for (uint32 j = 0; j < 26; ++j)
{ data << uint32(holiday->Id); // m_ID
uint32 unk10; data << uint32(holiday->Region); // m_region, might be looping
} data << uint32(holiday->Looping); // m_looping, might be region
for (uint32 j = 0; j < 10; ++j) data << uint32(holiday->Priority); // m_priority
{ data << uint32(holiday->CalendarFilterType); // m_calendarFilterType
uint32 unk11;
} for (uint8 j = 0; j < sizeof(holiday->Date)/sizeof(holiday->Date[0]; ++j)
for (uint32 j = 0; j < 10; ++j) data << uint32(holiday->Date[j]); // 26 * m_date
{
uint32 unk12; for (uint8 j = 0; j < sizeof(holiday->Duration)/sizeof(holiday->Duration[0]; ++j)
} data << uint32(holiday->Duration[j]); // 10 * m_duration
std::string holidayName; // 64 chars
for (uint8 j = 0; j < sizeof(holiday->CalendarFlags)/sizeof(holiday->CalendarFlags[0]; ++j)
data << uint32(holiday->CalendarFlags[j]); // 10 * m_calendarFlags
data << holiday->TextureFilename.c_str(); // m_textureFilename (holiday name)
} }
*/
SendPacket(&data); SendPacket(&data);
} }