Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts: src/server/game/Achievements/AchievementMgr.cpp src/server/game/Battlegrounds/ArenaScore.h src/server/game/Battlegrounds/Battleground.cpp src/server/game/Battlegrounds/Battleground.h src/server/game/Entities/Object/Object.cpp src/server/game/Entities/Pet/Pet.cpp src/server/scripts/Commands/cs_wp.cpp
This commit is contained in:
commit
13ff07f121
45 files changed
+1802
-1543
No files matched your search
@@ -1384,6 +1384,7 @@ public:
|
||||
Player* target;
|
||||
uint64 targetGuid;
|
||||
std::string targetName;
|
||||
PreparedStatement* stmt = NULL;
|
||||
|
||||
// To make sure we get a target, we convert our guid to an omniversal...
|
||||
uint32 parseGUID = MAKE_NEW_GUID(atol((char*)args), 0, HIGHGUID_PLAYER);
|
||||
@@ -1513,7 +1514,7 @@ public:
|
||||
return false;
|
||||
|
||||
// Query informations from the DB
|
||||
PreparedStatement* stmt = CharacterDatabase.GetPreparedStatement(CHAR_SEL_CHAR_PINFO);
|
||||
stmt = CharacterDatabase.GetPreparedStatement(CHAR_SEL_CHAR_PINFO);
|
||||
stmt->setUInt32(0, lowguid);
|
||||
PreparedQueryResult result = CharacterDatabase.Query(stmt);
|
||||
|
||||
@@ -1540,7 +1541,7 @@ public:
|
||||
}
|
||||
|
||||
// Query the prepared statement for login data
|
||||
PreparedStatement* stmt = LoginDatabase.GetPreparedStatement(LOGIN_SEL_PINFO);
|
||||
stmt = LoginDatabase.GetPreparedStatement(LOGIN_SEL_PINFO);
|
||||
stmt->setInt32(0, int32(realmID));
|
||||
stmt->setUInt32(1, accId);
|
||||
PreparedQueryResult result = LoginDatabase.Query(stmt);
|
||||
@@ -1564,7 +1565,7 @@ public:
|
||||
EndianConvertReverse(ip);
|
||||
|
||||
// If ip2nation table is populated, it displays the country
|
||||
PreparedStatement* stmt = LoginDatabase.GetPreparedStatement(LOGIN_SEL_IP2NATION_COUNTRY);
|
||||
stmt = LoginDatabase.GetPreparedStatement(LOGIN_SEL_IP2NATION_COUNTRY);
|
||||
stmt->setUInt32(0, ip);
|
||||
if (PreparedQueryResult result2 = LoginDatabase.Query(stmt))
|
||||
{
|
||||
@@ -1641,13 +1642,13 @@ public:
|
||||
PreparedQueryResult result5 = CharacterDatabase.Query(stmt3);
|
||||
if (result5)
|
||||
{
|
||||
Field* fields = result5->Fetch();
|
||||
guildId = fields[0].GetUInt32();
|
||||
guildName = fields[1].GetString();
|
||||
guildRank = fields[2].GetString();
|
||||
guildRankId = fields[3].GetUInt8();
|
||||
note = fields[4].GetString();
|
||||
officeNote = fields[5].GetString();
|
||||
Field* fields5 = result5->Fetch();
|
||||
guildId = fields5[0].GetUInt32();
|
||||
guildName = fields5[1].GetString();
|
||||
guildRank = fields5[2].GetString();
|
||||
guildRankId = fields5[3].GetUInt8();
|
||||
note = fields5[4].GetString();
|
||||
officeNote = fields5[5].GetString();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user