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

build fix

Browse Source 
By ariel-
This commit is contained in:
Aokromes
2017-02-04 20:15:14 +01:00
parent 4c6ce2e565
commit 3cd922b962
2 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/server/game/Handlers/GuildHandler.cpp
View File

@@ -24,6 +24,7 @@
#include "GuildMgr.h"
#include "Log.h"
#include "Guild.h"
#include "QueryCallback.h"
void WorldSession::HandleGuildQueryOpcode(WorldPacket& recvPacket)
{
@@ -991,12 +992,10 @@ void WorldSession::HandleGuildRenameRequest(WorldPacket& recvPacket)
{
PreparedStatement* stmt = CharacterDatabase.GetPreparedStatement(CHAR_UPD_GUILD_NAME);
_guildRenameCallback.SetParam(newName);
stmt->setUInt32(1, pGuild->GetId());
stmt->setString(0, newName);
_guildRenameCallback.SetFutureResult(CharacterDatabase.AsyncQuery(stmt));
_queryProcessor.AddQuery(CharacterDatabase.AsyncQuery(stmt).WithPreparedCallback(std::bind(&WorldSession::HandleGuildRenameCallback, this, newName, std::placeholders::_1)));
WorldPacket data(SMSG_GUILD_FLAGGED_FOR_RENAME,1);
@@ -1007,12 +1006,11 @@ void WorldSession::HandleGuildRenameRequest(WorldPacket& recvPacket)
}
}
void WorldSession::HandleGuildRenameCallback(std::string newName)
void WorldSession::HandleGuildRenameCallback(std::string newName, PreparedQueryResult result)
{
/*
Guild* pGuild = GetPlayer()->GetGuild();
bool hasRenamed = ((PreparedQueryResult)_guildRenameCallback.GetFutureResult)->GetRowCount() > 0 ? true : false;
bool hasRenamed = (result && result->GetRowCount() > 0);
WorldPacket data(SMSG_GUILD_CHANGE_NAME_RESULT, 1);
data.WriteBit(hasRenamed);
@@ -1023,7 +1021,7 @@ void WorldSession::HandleGuildRenameCallback(std::string newName)
if(pGuild && hasRenamed)
pGuild->SetName(newName);
}
/*
void WorldSession::HandleGuildChallengeRequest(WorldPacket& recvPacket)
{
uint8 counter = 4;
@@ -1077,5 +1075,5 @@ void WorldSession::HandleGuildChallengeRequest(WorldPacket& recvPacket)
}
return;
}
*/
}
*/

1
src/server/game/Server/WorldSession.h
View File

@@ -685,7 +685,6 @@ class TC_GAME_API WorldSession
void HandleGuildRenameRequest(WorldPacket& recvPacket);
void HandleGuildChallengeRequest(WorldPacket& recvPacket);
void SendGuildCancelInvite(std::string unkString, uint8 unkByte);
void HandleGuildRenameCallback(std::string newName);
void HandleAutoDeclineGuildInvites(WorldPacket& recvPacket);
void HandleGuildSwitchRankOpcode(WorldPacket& recvPacket);
void HandleGuildRequestChallengeUpdate(WorldPacket& recvPacket);