Fixed some merging errors, there could be more, but at least it compiles.

This commit is contained in:
kaelima committed 2012-05-30 09:22:56 +02:00
1 parent f40e0d0a9a
commit 774f3cdc9b
22 files changed
+101 -90

No files matched your search

-13
View File
@@ -858,19 +858,6 @@ int WorldSocket::HandleAuthSession(WorldPacket& recvPacket)
stmt->setString(0, account);
PreparedQueryResult result = LoginDatabase.Query(stmt);
"sessionkey, " //1
"last_ip, " //2
"locked, " //3
"v, " //4
"s, " //5
"expansion, " //6
"mutetime, " //7
"locale, " //8
"recruiter, " //9
"os "
"FROM account "
"WHERE username = '%s'",
safe_account.c_str());
// Stop if the account is not found
if (!result)