Merge aftermath

This commit is contained in:
akkadius 2014-09-21 02:58:56 -05:00
parent ad29fa9cfa
commit 4ed88e348e
2 changed files with 8 additions and 3 deletions

View File

@ -785,7 +785,12 @@ uint32 Database::GetAccountIDByChar(const char* charname, uint32* oCharID) {
return 0;
auto row = results.begin();
if (row[0]){ accountId = atoi(row[0]); }
uint32 accountId = atoi(row[0]);
if (oCharID)
*oCharID = atoi(row[1]);
return accountId;
}

View File

@ -132,7 +132,7 @@ public:
*/
bool CheckNameFilter(const char* name, bool surname = false);
bool CheckUsedName(const char* name);
uint32 GetAccountIDByChar(const char* charname);
uint32 GetAccountIDByChar(const char* charname, uint32* oCharID = 0);
uint32 GetAccountIDByChar(uint32 char_id);
uint32 GetAccountIDByName(const char* accname, int16* status = 0, uint32* lsid = 0);
uint32 GetGuildIDByCharID(uint32 char_id);