Add pet size preservation like live

Run the SQL!!
This commit is contained in:
Michael Cook (mackal)
2014-01-09 14:25:29 -05:00
parent a394bf25b2
commit fdced53be1
8 changed files with 27 additions and 15 deletions
+12 -11
View File
@@ -2745,11 +2745,11 @@ void ZoneDatabase::SavePetInfo(Client *c) {
safe_delete_array(query);
if(!database.RunQuery(query, MakeAnyLenString(&query,
"INSERT INTO `character_pet_info` (`char_id`, `pet`, `petname`, `petpower`, `spell_id`, `hp`, `mana`) "
"values (%u, 0, '%s', %i, %u, %u, %u) "
"ON DUPLICATE KEY UPDATE `petname`='%s', `petpower`=%i, `spell_id`=%u, `hp`=%u, `mana`=%u",
c->CharacterID(), petinfo->Name, petinfo->petpower, petinfo->SpellID, petinfo->HP, petinfo->Mana,
petinfo->Name, petinfo->petpower, petinfo->SpellID, petinfo->HP, petinfo->Mana),
"INSERT INTO `character_pet_info` (`char_id`, `pet`, `petname`, `petpower`, `spell_id`, `hp`, `mana`, `size`) "
"values (%u, 0, '%s', %i, %u, %u, %u, %f) "
"ON DUPLICATE KEY UPDATE `petname`='%s', `petpower`=%i, `spell_id`=%u, `hp`=%u, `mana`=%u, `size`=%f",
c->CharacterID(), petinfo->Name, petinfo->petpower, petinfo->SpellID, petinfo->HP, petinfo->Mana, petinfo->size,
petinfo->Name, petinfo->petpower, petinfo->SpellID, petinfo->HP, petinfo->Mana, petinfo->size),
errbuf))
{
safe_delete_array(query);
@@ -2792,11 +2792,11 @@ void ZoneDatabase::SavePetInfo(Client *c) {
if(!database.RunQuery(query, MakeAnyLenString(&query,
"INSERT INTO `character_pet_info` (`char_id`, `pet`, `petname`, `petpower`, `spell_id`, `hp`, `mana`) "
"values (%u, 1, '%s', %u, %u, %u, %u) "
"ON DUPLICATE KEY UPDATE `petname`='%s', `petpower`=%i, `spell_id`=%u, `hp`=%u, `mana`=%u",
c->CharacterID(), suspended->Name, suspended->petpower, suspended->SpellID, suspended->HP, suspended->Mana,
suspended->Name, suspended->petpower, suspended->SpellID, suspended->HP, suspended->Mana),
"INSERT INTO `character_pet_info` (`char_id`, `pet`, `petname`, `petpower`, `spell_id`, `hp`, `mana`, `size`) "
"values (%u, 1, '%s', %u, %u, %u, %u, %f) "
"ON DUPLICATE KEY UPDATE `petname`='%s', `petpower`=%i, `spell_id`=%u, `hp`=%u, `mana`=%u, `size`=%f",
c->CharacterID(), suspended->Name, suspended->petpower, suspended->SpellID, suspended->HP, suspended->Mana, suspended->size,
suspended->Name, suspended->petpower, suspended->SpellID, suspended->HP, suspended->Mana, suspended->size),
errbuf))
{
safe_delete_array(query);
@@ -2842,7 +2842,7 @@ void ZoneDatabase::LoadPetInfo(Client *c) {
memset(suspended, 0, sizeof(PetInfo));
if(database.RunQuery(query, MakeAnyLenString(&query,
"SELECT `pet`, `petname`, `petpower`, `spell_id`, `hp`, `mana` from `character_pet_info` where `char_id`=%u",
"SELECT `pet`, `petname`, `petpower`, `spell_id`, `hp`, `mana`, `size` from `character_pet_info` where `char_id`=%u",
c->CharacterID()), errbuf, &result))
{
safe_delete_array(query);
@@ -2860,6 +2860,7 @@ void ZoneDatabase::LoadPetInfo(Client *c) {
pi->SpellID = atoi(row[3]);
pi->HP = atoul(row[4]);
pi->Mana = atoul(row[5]);
pi->size = atof(row[6]);
}
mysql_free_result(result);
}