pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2025-12-12 09:31:30 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Errbuf fix and GetCharacterInfo converted to QueryDatabase

Browse Source
This commit is contained in:
Arthur Ice 2014-07-03 21:14:27 -07:00 committed by Arthur Ice
parent a054b83b92
commit f7c637a0d9
1 changed files with 31 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
common/database.cpp
View File

@ -1506,7 +1506,7 @@ bool Database::MoveCharacterToZone(uint32 iCharID, const char* iZonename) {
if (!results.Success()) if (!results.Success())
{ {
std::cerr << "Error in MoveCharacterToZone(id) query '" << query << "' " << errbuf << std::endl; std::cerr << "Error in MoveCharacterToZone(id) query '" << query << "' " << results.ErrorMessage() << std::endl;
safe_delete_array(query); safe_delete_array(query);
return false; return false;
} }
@ -1568,7 +1568,7 @@ bool Database::SetHackerFlag(const char* accountname, const char* charactername,
if (!results.Success()) if (!results.Success())
{ {
std::cerr << "Error in SetHackerFlag query '" << query << "' " << errbuf << std::endl; std::cerr << "Error in SetHackerFlag query '" << query << "' " << results.ErrorMessage() << std::endl;
safe_delete_array(query); safe_delete_array(query);
return false; return false;
} }
@ -1665,15 +1665,23 @@ uint8 Database::GetSkillCap(uint8 skillid, uint8 in_race, uint8 in_class, uint16
} }
uint32 Database::GetCharacterInfo(const char* iName, uint32* oAccID, uint32* oZoneID, uint32* oInstanceID, float* oX, float* oY, float* oZ) { uint32 Database::GetCharacterInfo(const char* iName, uint32* oAccID, uint32* oZoneID, uint32* oInstanceID, float* oX, float* oY, float* oZ) {
char errbuf[MYSQL_ERRMSG_SIZE]; char *query = nullptr;
char *query = 0;
MYSQL_RES *result;
MYSQL_ROW row;
if (RunQuery(query, MakeAnyLenString(&query, "SELECT id, account_id, zonename, instanceid, x, y, z FROM character_ WHERE name='%s'", iName), errbuf, &result)) { auto results = QueryDatabase(query, MakeAnyLenString(&query, "SELECT id, account_id, zonename, instanceid, x, y, z FROM character_ WHERE name='%s'", iName));
if (!results.Success())
{
std::cerr << "Error in GetCharacterInfo query '" << query << "' " << results.ErrorMessage() << std::endl;
safe_delete_array(query); safe_delete_array(query);
if (mysql_num_rows(result) == 1) { return 0;
row = mysql_fetch_row(result); }
safe_delete_array(query);
if (results.RowCount() != 1)
return 0;
auto row = results.begin();
uint32 charid = atoi(row[0]); uint32 charid = atoi(row[0]);
if (oAccID) if (oAccID)
*oAccID = atoi(row[1]); *oAccID = atoi(row[1]);
@ -1687,17 +1695,9 @@ uint32 Database::GetCharacterInfo(const char* iName, uint32* oAccID, uint32* oZo
*oY = atof(row[5]); *oY = atof(row[5]);
if (oZ) if (oZ)
*oZ = atof(row[6]); *oZ = atof(row[6]);
mysql_free_result(result);
return charid; return charid;
} }
mysql_free_result(result);
}
else {
std::cerr << "Error in GetCharacterInfo query '" << query << "' " << errbuf << std::endl;
safe_delete_array(query);
}
return 0;
}
bool Database::UpdateLiveChar(char* charname,uint32 lsaccount_id) { bool Database::UpdateLiveChar(char* charname,uint32 lsaccount_id) {
char errbuf[MYSQL_ERRMSG_SIZE]; char errbuf[MYSQL_ERRMSG_SIZE];