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

Scripts/Commands: Show correct guild Rank when using .pinfo command

Browse Source 
(Corrections to 1b551cc1)
This commit is contained in:
Spp
2013-01-31 09:16:45 +01:00
parent 0a9fbc6588
commit 67d46ae1ae
2 changed files with 9 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/server/scripts/Commands/cs_misc.cpp
View File

@@ -1740,19 +1740,13 @@ public:
result = CharacterDatabase.Query(stmt);
if (result)
{
uint32 guildId = 0;
std::string guildName = "";
std::string guildRank = "";
std::string note = "";
std::string officeNote = "";
Field* fields = result->Fetch();
Field* fields = result->Fetch();
guildId = fields[0].GetUInt32();
guildName = fields[1].GetString();
//rankId = fields[2].GetUInt8();
guildRank = fields[3].GetString();
note = fields[4].GetString();
officeNote = fields[5].GetString();
uint32 guildId = fields[0].GetUInt32();
std::string guildName = fields[1].GetString();
std::string guildRank = fields[2].GetString();
std::string note = fields[3].GetString();
std::string officeNote = fields[4].GetString();
handler->PSendSysMessage(LANG_PINFO_GUILD_INFO, guildName.c_str(), guildId, guildRank.c_str(), note.c_str(), officeNote.c_str());
}

4
src/server/shared/Database/Implementation/CharacterDatabase.cpp
View File

@@ -101,7 +101,9 @@ void CharacterDatabaseConnection::DoPrepareStatements()
PrepareStatement(CHAR_SEL_CHARACTER_SPELLCOOLDOWNS, "SELECT spell, item, time FROM character_spell_cooldown WHERE guid = ?", CONNECTION_ASYNC);
PrepareStatement(CHAR_SEL_CHARACTER_DECLINEDNAMES, "SELECT genitive, dative, accusative, instrumental, prepositional FROM character_declinedname WHERE guid = ?", CONNECTION_ASYNC);
PrepareStatement(CHAR_SEL_GUILD_MEMBER, "SELECT guildid, rank FROM guild_member WHERE guid = ?", CONNECTION_BOTH);
PrepareStatement(CHAR_SEL_GUILD_MEMBER_EXTENDED, "SELECT g.guildid, g.name, gm.rank, gr.rname, gm.pnote, gm.offnote FROM guild g JOIN guild_member gm ON g.guildid = gm.guildid JOIN guild_rank gr ON g.guildid = gr.guildid WHERE gm.guid = ?", CONNECTION_BOTH);
PrepareStatement(CHAR_SEL_GUILD_MEMBER_EXTENDED, "SELECT g.guildid, g.name, gr.rname, gm.pnote, gm.offnote "
"FROM guild g JOIN guild_member gm ON g.guildid = gm.guildid "
"JOIN guild_rank gr ON g.guildid = gr.guildid AND gm.rank = gr.rid WHERE gm.guid = ?", CONNECTION_BOTH);
PrepareStatement(CHAR_SEL_CHARACTER_ACHIEVEMENTS, "SELECT achievement, date FROM character_achievement WHERE guid = ?", CONNECTION_ASYNC);
PrepareStatement(CHAR_SEL_CHARACTER_CRITERIAPROGRESS, "SELECT criteria, counter, date FROM character_achievement_progress WHERE guid = ?", CONNECTION_ASYNC);
PrepareStatement(CHAR_SEL_CHARACTER_EQUIPMENTSETS, "SELECT setguid, setindex, name, iconname, ignore_mask, item0, item1, item2, item3, item4, item5, item6, item7, item8, "