diff options
| -rw-r--r-- | sql/updates/world/2012_02_02_01_world_spell_script_names.sql (renamed from sql/updates/world/2012_07_10_00_world_spell_script_names.sql) | 0 | ||||
| -rw-r--r-- | sql/updates/world/2012_08_02_00_world_spell_script_names.sql (renamed from sql/updates/world/2012_06_14_09_world_spell_script_names.sql) | 0 | ||||
| -rwxr-xr-x | src/server/game/DataStores/DBCStructure.h | 6 | ||||
| -rwxr-xr-x | src/server/game/Guilds/Guild.cpp | 7 | ||||
| -rwxr-xr-x | src/server/game/Handlers/MailHandler.cpp | 2 | ||||
| -rwxr-xr-x | src/server/game/Mails/Mail.h | 5 |
6 files changed, 10 insertions, 10 deletions
diff --git a/sql/updates/world/2012_07_10_00_world_spell_script_names.sql b/sql/updates/world/2012_02_02_01_world_spell_script_names.sql index 15ca9c43cc5..15ca9c43cc5 100644 --- a/sql/updates/world/2012_07_10_00_world_spell_script_names.sql +++ b/sql/updates/world/2012_02_02_01_world_spell_script_names.sql diff --git a/sql/updates/world/2012_06_14_09_world_spell_script_names.sql b/sql/updates/world/2012_08_02_00_world_spell_script_names.sql index f14e44e35ff..f14e44e35ff 100644 --- a/sql/updates/world/2012_06_14_09_world_spell_script_names.sql +++ b/sql/updates/world/2012_08_02_00_world_spell_script_names.sql diff --git a/src/server/game/DataStores/DBCStructure.h b/src/server/game/DataStores/DBCStructure.h index 15792fd57da..fdec06f6f48 100755 --- a/src/server/game/DataStores/DBCStructure.h +++ b/src/server/game/DataStores/DBCStructure.h @@ -1052,7 +1052,7 @@ struct GtRegenMPPerSptEntry /* no used struct HolidayDescriptionsEntry { - uint32 ID; // 0, this is NOT holiday id + uint32 ID; // 0, m_holidayDescriptionID //char* name[16] // 1-16 m_name_lang // 17 name flags }; @@ -1061,7 +1061,7 @@ struct HolidayDescriptionsEntry /* no used struct HolidayNamesEntry { - uint32 ID; // 0, this is NOT holiday id + uint32 ID; // 0, m_holidayNameID //char* name[16] // 1-16 m_name_lang // 17 name flags }; @@ -1203,7 +1203,7 @@ struct LFGDungeonEntry uint32 recmaxlevel; // 22 int32 map; // 23 uint32 difficulty; // 24 - //uint32 flags; // 25 + //uint32 flags; // 25 (flags & 4) = IsHoliday uint32 type; // 26 //uint32 unk; // 27 //char* iconname; // 28 diff --git a/src/server/game/Guilds/Guild.cpp b/src/server/game/Guilds/Guild.cpp index 889174420c6..0811ba06137 100755 --- a/src/server/game/Guilds/Guild.cpp +++ b/src/server/game/Guilds/Guild.cpp @@ -1226,11 +1226,10 @@ void Guild::HandleRoster(WorldSession* session /*= NULL*/) void Guild::HandleQuery(WorldSession* session) { WorldPacket data(SMSG_GUILD_QUERY_RESPONSE, 8 * 32 + 200); // Guess size - data << uint32(m_id); data << m_name; - for (uint8 i = 0; i < GUILD_RANKS_MAX_COUNT; ++i) // Alwayse show 10 ranks + for (uint8 i = 0; i < GUILD_RANKS_MAX_COUNT; ++i) // Always show 10 ranks { if (i < _GetRanksSize()) data << m_ranks[i].GetName(); @@ -1239,9 +1238,9 @@ void Guild::HandleQuery(WorldSession* session) } m_emblemInfo.WritePacket(data); - data << uint32(0); // Something new in WotLK - + data << uint32(_GetRanksSize()); // Amount of ranks session->SendPacket(&data); + sLog->outDebug(LOG_FILTER_NETWORKIO, "WORLD: Sent (SMSG_GUILD_QUERY_RESPONSE)"); } diff --git a/src/server/game/Handlers/MailHandler.cpp b/src/server/game/Handlers/MailHandler.cpp index 69a84892e76..a98453e45c3 100755 --- a/src/server/game/Handlers/MailHandler.cpp +++ b/src/server/game/Handlers/MailHandler.cpp @@ -614,7 +614,7 @@ void WorldSession::HandleGetMailList(WorldPacket & recv_data) } data << uint32((*itr)->COD); // COD - data << uint32(0); // probably changed in 3.3.3 + data << uint32(0); // package (Package.dbc) data << uint32((*itr)->stationery); // stationery (Stationery.dbc) data << uint32((*itr)->money); // Gold data << uint32((*itr)->checked); // flags diff --git a/src/server/game/Mails/Mail.h b/src/server/game/Mails/Mail.h index ea319c731d0..8efb33bda9a 100755 --- a/src/server/game/Mails/Mail.h +++ b/src/server/game/Mails/Mail.h @@ -56,8 +56,9 @@ enum MailStationery MAIL_STATIONERY_DEFAULT = 41, MAIL_STATIONERY_GM = 61, MAIL_STATIONERY_AUCTION = 62, - MAIL_STATIONERY_VAL = 64, - MAIL_STATIONERY_CHR = 65, + MAIL_STATIONERY_VAL = 64, // Valentine + MAIL_STATIONERY_CHR = 65, // Christmas + MAIL_STATIONERY_ORP = 67, // Orphan }; enum MailState |