pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-04-17 06:32:39 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

GetPoweredPetEntry converted to QueryDatabase

Browse Source
This commit is contained in:
Arthur Ice 2014-08-18 22:02:35 -07:00
parent 8b89beb02e
commit 977b28cb9c
1 changed files with 25 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
zone/pets.cpp
View File

@ -450,27 +450,25 @@ bool ZoneDatabase::GetPetEntry(const char *pet_type, PetRecord *into) {
} }
bool ZoneDatabase::GetPoweredPetEntry(const char *pet_type, int16 petpower, PetRecord *into) { bool ZoneDatabase::GetPoweredPetEntry(const char *pet_type, int16 petpower, PetRecord *into) {
char errbuf[MYSQL_ERRMSG_SIZE]; std::string query;
char *query = 0;
uint32 querylen = 0;
MYSQL_RES *result;
MYSQL_ROW row;
if (petpower <= 0) { if (petpower <= 0)
querylen = MakeAnyLenString(&query, query = StringFormat("SELECT npcID, temp, petpower, petcontrol, petnaming, monsterflag, equipmentset "
"SELECT npcID, temp, petpower, petcontrol, petnaming, monsterflag, equipmentset FROM pets " "FROM pets WHERE type='%s' AND petpower<=0", pet_type);
"WHERE type='%s' AND petpower<=0", pet_type); else
} query = StringFormat("SELECT npcID, temp, petpower, petcontrol, petnaming, monsterflag, equipmentset "
else { "FROM pets WHERE type='%s' AND petpower<=%d ORDER BY petpower DESC LIMIT 1",
querylen = MakeAnyLenString(&query, pet_type, petpower);
"SELECT npcID, temp, petpower, petcontrol, petnaming, monsterflag, equipmentset FROM pets " auto results = QueryDatabase(query);
"WHERE type='%s' AND petpower<=%d ORDER BY petpower DESC LIMIT 1", pet_type, petpower); if (!results.Success()) {
LogFile->write(EQEMuLog::Error, "Error in GetPoweredPetEntry query '%s': %s", query.c_str(), results.ErrorMessage().c_str());
return false;
} }
if (RunQuery(query, querylen, errbuf, &result)) { if (results.RowCount() != 1)
safe_delete_array(query); return false;
if (mysql_num_rows(result) == 1) {
row = mysql_fetch_row(result); auto row = results.begin();
into->npc_type = atoi(row[0]); into->npc_type = atoi(row[0]);
into->temporary = atoi(row[1]); into->temporary = atoi(row[1]);
@ -480,16 +478,7 @@ bool ZoneDatabase::GetPoweredPetEntry(const char *pet_type, int16 petpower, PetR
into->monsterflag = atoi(row[5]); into->monsterflag = atoi(row[5]);
into->equipmentset = atoi(row[6]); into->equipmentset = atoi(row[6]);
mysql_free_result(result); return true;
return(true);
}
mysql_free_result(result);
}
else {
LogFile->write(EQEMuLog::Error, "Error in GetPoweredPetEntry query '%s': %s", query, errbuf);
safe_delete_array(query);
}
return(false);
} }
Mob* Mob::GetPet() { Mob* Mob::GetPet() {