Some minor format changes to SaveCharacterCorpse

This commit is contained in:
Akkadius 2015-01-27 20:24:43 -06:00
parent 0f196cc995
commit 2211a63fe7

View File

@ -3415,29 +3415,91 @@ uint32 ZoneDatabase::SaveCharacterCorpse(uint32 charid, const char* charname, ui
/* Dump Basic Corpse Data */ /* Dump Basic Corpse Data */
std::string query = StringFormat( std::string query = StringFormat(
"INSERT INTO `character_corpses` " "INSERT INTO `character_corpses` "
"SET `charname` = '%s', `zone_id` = %u, `instance_id` = %u, `charid` = %d," "SET `charname` = '%s', "
"`x` = %1.1f, `y` = %1.1f, `z` = %1.1f, `heading` = %1.1f," "`zone_id` = %u, "
"`time_of_death` = NOW(), `is_buried` = 0, `is_locked` = %d," "`instance_id` = %u, "
"`exp` = %u, `size` = %f, `level` = %u, `race` = %u, `gender` = %u," "`charid` = %d, "
"`class` = %u, `deity` = %u, `texture` = %u, `helm_texture` = %u," "`x` = %1.1f, "
"`copper` = %u, `silver` = %u,`gold` = %u,`platinum` = %u," "`y` = %1.1f, "
"`hair_color` = %u, `beard_color` = %u, `eye_color_1` = %u," "`z` = %1.1f, "
"`eye_color_2` = %u, `hair_style` = %u, `face` = %u," "`heading` = %1.1f, "
"`beard` = %u, `drakkin_heritage` = %u, `drakkin_tattoo` = %u," "`time_of_death` = NOW(), "
"`drakkin_details` = %u, `wc_1` = %u, `wc_2` = %u," "`is_buried` = 0, "
"`wc_3` = %u, `wc_4` = %u, `wc_5` = %u, `wc_6` = %u," "`is_locked` = %d, "
"`wc_7` = %u,`wc_8` = %u,`wc_9` = %u", "`exp` = %u, "
EscapeString(charname).c_str(), zoneid, instanceid, charid, "`size` = %f, "
position.x, position.y, position.z, position.w, "`level` = %u, "
dbpc->locked, dbpc->exp, dbpc->size, dbpc->level, dbpc->race, "`race` = %u, "
dbpc->gender, dbpc->class_, dbpc->deity, dbpc->texture, "`gender` = %u, "
dbpc->helmtexture, dbpc->copper, dbpc->silver, dbpc->gold, "`class` = %u, "
dbpc->plat, dbpc->haircolor, dbpc->beardcolor, dbpc->eyecolor1, "`deity` = %u, "
dbpc->eyecolor2, dbpc->hairstyle, dbpc->face, dbpc->beard, "`texture` = %u, "
dbpc->drakkin_heritage, dbpc->drakkin_tattoo, dbpc->drakkin_details, "`helm_texture` = %u, "
dbpc->item_tint[0].color, dbpc->item_tint[1].color, dbpc->item_tint[2].color, "`copper` = %u, "
dbpc->item_tint[3].color, dbpc->item_tint[4].color, dbpc->item_tint[5].color, "`silver` = %u, "
dbpc->item_tint[6].color, dbpc->item_tint[7].color, dbpc->item_tint[8].color); "`gold` = %u, "
"`platinum` = %u, "
"`hair_color` = %u, "
"`beard_color` = %u, "
"`eye_color_1` = %u, "
"`eye_color_2` = %u, "
"`hair_style` = %u, "
"`face` = %u, "
"`beard` = %u, "
"`drakkin_heritage` = %u, "
"`drakkin_tattoo` = %u, "
"`drakkin_details` = %u, "
"`wc_1` = %u, "
"`wc_2` = %u, "
"`wc_3` = %u, "
"`wc_4` = %u, "
"`wc_5` = %u, "
"`wc_6` = %u, "
"`wc_7` = %u, "
"`wc_8` = %u, "
"`wc_9` = %u ",
EscapeString(charname).c_str(),
zoneid,
instanceid,
charid,
position.x,
position.y,
position.z,
position.w,
dbpc->locked,
dbpc->exp,
dbpc->size,
dbpc->level,
dbpc->race,
dbpc->gender,
dbpc->class_,
dbpc->deity,
dbpc->texture,
dbpc->helmtexture,
dbpc->copper,
dbpc->silver,
dbpc->gold,
dbpc->plat,
dbpc->haircolor,
dbpc->beardcolor,
dbpc->eyecolor1,
dbpc->eyecolor2,
dbpc->hairstyle,
dbpc->face,
dbpc->beard,
dbpc->drakkin_heritage,
dbpc->drakkin_tattoo,
dbpc->drakkin_details,
dbpc->item_tint[0].color,
dbpc->item_tint[1].color,
dbpc->item_tint[2].color,
dbpc->item_tint[3].color,
dbpc->item_tint[4].color,
dbpc->item_tint[5].color,
dbpc->item_tint[6].color,
dbpc->item_tint[7].color,
dbpc->item_tint[8].color
);
auto results = QueryDatabase(query); auto results = QueryDatabase(query);
uint32 last_insert_id = results.LastInsertedID(); uint32 last_insert_id = results.LastInsertedID();
@ -3479,7 +3541,9 @@ uint32 ZoneDatabase::SaveCharacterCorpse(uint32 charid, const char* charname, ui
); );
} }
} }
QueryDatabase(corpse_items_query); if (!corpse_items_query.empty())
QueryDatabase(corpse_items_query);
return last_insert_id; return last_insert_id;
} }