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

More clang-formatting

Browse Source
This commit is contained in:
Michael Cook (mackal) 2015-01-31 01:22:40 -05:00
parent 3c08af5ca1
commit 0bdbc5f5c9
1 changed files with 70 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
common/shareddb.cpp
View File

@ -382,7 +382,8 @@ bool SharedDatabase::SetStartingItems(PlayerProfile_Struct* pp, Inventory* inv,
// Retrieve shared bank inventory based on either account or character // Retrieve shared bank inventory based on either account or character
bool SharedDatabase::GetSharedBank(uint32 id, Inventory* inv, bool is_charid) { bool SharedDatabase::GetSharedBank(uint32 id, Inventory *inv, bool is_charid)
{
std::string query; std::string query;
if (is_charid) if (is_charid)
@ -390,15 +391,18 @@ bool SharedDatabase::GetSharedBank(uint32 id, Inventory* inv, bool is_charid) {
"sb.augslot1, sb.augslot2, sb.augslot3, " "sb.augslot1, sb.augslot2, sb.augslot3, "
"sb.augslot4, sb.augslot5, sb.augslot6, sb.custom_data " "sb.augslot4, sb.augslot5, sb.augslot6, sb.custom_data "
"FROM sharedbank sb INNER JOIN character_data ch " "FROM sharedbank sb INNER JOIN character_data ch "
"ON ch.account_id=sb.acctid WHERE ch.id = %i", id); "ON ch.account_id=sb.acctid WHERE ch.id = %i",
id);
else else
query = StringFormat("SELECT slotid, itemid, charges, " query = StringFormat("SELECT slotid, itemid, charges, "
"augslot1, augslot2, augslot3, " "augslot1, augslot2, augslot3, "
"augslot4, augslot5, augslot6, custom_data " "augslot4, augslot5, augslot6, custom_data "
"FROM sharedbank WHERE acctid=%i", id); "FROM sharedbank WHERE acctid=%i",
id);
auto results = QueryDatabase(query); auto results = QueryDatabase(query);
if (!results.Success()) { if (!results.Success()) {
Log.Out(Logs::General, Logs::Error, "Database::GetSharedBank(uint32 account_id): %s", results.ErrorMessage().c_str()); Log.Out(Logs::General, Logs::Error, "Database::GetSharedBank(uint32 account_id): %s",
results.ErrorMessage().c_str());
return false; return false;
} }
@ -415,26 +419,26 @@ bool SharedDatabase::GetSharedBank(uint32 id, Inventory* inv, bool is_charid) {
aug[4] = (uint32)atoi(row[7]); aug[4] = (uint32)atoi(row[7]);
aug[5] = (uint32)atoi(row[8]); aug[5] = (uint32)atoi(row[8]);
const Item_Struct* item = GetItem(item_id); const Item_Struct *item = GetItem(item_id);
if (!item) { if (!item) {
Log.Out(Logs::General, Logs::Error, Log.Out(Logs::General, Logs::Error,
"Warning: %s %i has an invalid item_id %i in inventory slot %i", "Warning: %s %i has an invalid item_id %i in inventory slot %i",
((is_charid==true) ? "charid" : "acctid"), id, item_id, slot_id); ((is_charid == true) ? "charid" : "acctid"), id, item_id, slot_id);
continue; continue;
} }
int16 put_slot_id = INVALID_INDEX; int16 put_slot_id = INVALID_INDEX;
ItemInst* inst = CreateBaseItem(item, charges); ItemInst *inst = CreateBaseItem(item, charges);
if (inst && item->ItemClass == ItemClassCommon) { if (inst && item->ItemClass == ItemClassCommon) {
for(int i = AUG_BEGIN; i < EmuConstants::ITEM_COMMON_SIZE; i++) { for (int i = AUG_BEGIN; i < EmuConstants::ITEM_COMMON_SIZE; i++) {
if (aug[i]) if (aug[i])
inst->PutAugment(this, i, aug[i]); inst->PutAugment(this, i, aug[i]);
} }
} }
if(!row[9]) if (!row[9])
continue; continue;
std::string data_str(row[9]); std::string data_str(row[9]);
@ -442,9 +446,9 @@ bool SharedDatabase::GetSharedBank(uint32 id, Inventory* inv, bool is_charid) {
std::string value; std::string value;
bool use_id = true; bool use_id = true;
for(int i = 0; i < data_str.length(); ++i) { for (int i = 0; i < data_str.length(); ++i) {
if(data_str[i] == '^') { if (data_str[i] == '^') {
if(!use_id) { if (!use_id) {
inst->SetCustomData(idAsString, value); inst->SetCustomData(idAsString, value);
idAsString.clear(); idAsString.clear();
value.clear(); value.clear();
@ -454,7 +458,7 @@ bool SharedDatabase::GetSharedBank(uint32 id, Inventory* inv, bool is_charid) {
} }
char v = data_str[i]; char v = data_str[i];
if(use_id) if (use_id)
idAsString.push_back(v); idAsString.push_back(v);
else else
value.push_back(v); value.push_back(v);
@ -467,8 +471,9 @@ bool SharedDatabase::GetSharedBank(uint32 id, Inventory* inv, bool is_charid) {
if (put_slot_id != INVALID_INDEX) if (put_slot_id != INVALID_INDEX)
continue; continue;
Log.Out(Logs::General, Logs::Error, "Warning: Invalid slot_id for item in shared bank inventory: %s=%i, item_id=%i, slot_id=%i", Log.Out(Logs::General, Logs::Error,
((is_charid==true)? "charid": "acctid"), id, item_id, slot_id); "Warning: Invalid slot_id for item in shared bank inventory: %s=%i, item_id=%i, slot_id=%i",
((is_charid == true) ? "charid" : "acctid"), id, item_id, slot_id);
if (is_charid) if (is_charid)
SaveInventory(id, nullptr, slot_id); SaveInventory(id, nullptr, slot_id);