From fdc8ad7ceac4bf35731637a1ee626491c788698c Mon Sep 17 00:00:00 2001 From: ariel- Date: Wed, 13 Jan 2016 01:47:53 -0300 Subject: [PATCH] Fix build after cherry-pick --- src/server/game/Server/WorldSession.cpp | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/src/server/game/Server/WorldSession.cpp b/src/server/game/Server/WorldSession.cpp index 747dbc549c..aba25fd235 100644 --- a/src/server/game/Server/WorldSession.cpp +++ b/src/server/game/Server/WorldSession.cpp @@ -760,12 +760,14 @@ void WorldSession::LoadAccountData(PreparedQueryResult result, uint32 mask) void WorldSession::SetAccountData(AccountDataType type, time_t tm, std::string const& data) { - uint32 id = 0; - uint32 index = 0; if ((1 << type) & GLOBAL_CACHE_MASK) { - id = GetAccountId(); - index = CHAR_REP_ACCOUNT_DATA; + PreparedStatement* stmt = CharacterDatabase.GetPreparedStatement(CHAR_REP_ACCOUNT_DATA); + stmt->setUInt32(0, GetAccountId()); + stmt->setUInt8(1, type); + stmt->setUInt32(2, uint32(tm)); + stmt->setString(3, data); + CharacterDatabase.Execute(stmt); } else { @@ -773,17 +775,14 @@ void WorldSession::SetAccountData(AccountDataType type, time_t tm, std::string c if (!m_GUIDLow) return; - id = m_GUIDLow; - index = CHAR_REP_PLAYER_ACCOUNT_DATA; + PreparedStatement* stmt = CharacterDatabase.GetPreparedStatement(CHAR_REP_PLAYER_ACCOUNT_DATA); + stmt->setUInt32(0, m_GUIDLow); + stmt->setUInt8(1, type); + stmt->setUInt32(2, uint32(tm)); + stmt->setString(3, data); + CharacterDatabase.Execute(stmt); } - PreparedStatement* stmt = CharacterDatabase.GetPreparedStatement(index); - stmt->setUInt32(0, id); - stmt->setUInt8 (1, type); - stmt->setUInt32(2, uint32(tm)); - stmt->setString(3, data); - CharacterDatabase.Execute(stmt); - m_accountData[type].Time = tm; m_accountData[type].Data = data; }