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

GetInventory(account_id, name, inv) converted to QueryDatabase

Browse Source
This commit is contained in:
Arthur Ice 2014-10-04 14:02:43 -07:00
parent aa780ceb8c
commit cb897786bc
1 changed files with 84 additions and 94 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

82
common/shareddb.cpp
View File

@ -597,33 +597,33 @@ bool SharedDatabase::GetInventory(uint32 char_id, Inventory* inv) {
// Overloaded: Retrieve character inventory based on account_id and character name // Overloaded: Retrieve character inventory based on account_id and character name
bool SharedDatabase::GetInventory(uint32 account_id, char* name, Inventory* inv) { bool SharedDatabase::GetInventory(uint32 account_id, char* name, Inventory* inv) {
char errbuf[MYSQL_ERRMSG_SIZE];
char* query = 0;
MYSQL_RES* result;
MYSQL_ROW row;
bool ret = false;
// Retrieve character inventory // Retrieve character inventory
if (RunQuery(query, MakeAnyLenString(&query, std::string query = StringFormat("SELECT slotid, itemid, charges, color, augslot1, "
" SELECT `slotid`, `itemid`, `charges`, `color`, `augslot1`, `augslot2`, `augslot3`, `augslot4`, `augslot5`, `instnodrop`, `custom_data`" "augslot2, augslot3, augslot4, augslot5, instnodrop, custom_data "
" FROM `inventory`" "FROM inventory INNER JOIN character_data ch "
" INNER JOIN `character_data` ch ON ch.id = charid" "ON ch.id = charid WHERE ch.name = '%s' AND ch.account_id = %i ORDER BY slotid",
" WHERE ch.NAME = '%s'" name, account_id);
" AND ch.account_id = % i" auto results = QueryDatabase(query);
" ORDER BY `slotid`", if (!results.Success()){
name, account_id), errbuf, &result)) LogFile->write(EQEMuLog::Error, "GetInventory query '%s' %s", query.c_str(), results.ErrorMessage().c_str());
{ LogFile->write(EQEMuLog::Error, "If you got an error related to the 'instnodrop' field, run the following SQL Queries:\nalter table inventory add instnodrop tinyint(1) unsigned default 0 not null;\n");
while ((row = mysql_fetch_row(result))) { return false;
}
for (auto row = results.begin(); row != results.end(); ++row) {
int16 slot_id = atoi(row[0]); int16 slot_id = atoi(row[0]);
uint32 item_id = atoi(row[1]); uint32 item_id = atoi(row[1]);
int8 charges = atoi(row[2]); int8 charges = atoi(row[2]);
uint32 color = atoul(row[3]); uint32 color = atoul(row[3]);
uint32 aug[EmuConstants::ITEM_COMMON_SIZE]; uint32 aug[EmuConstants::ITEM_COMMON_SIZE];
aug[0] = (uint32)atoi(row[4]); aug[0] = (uint32)atoi(row[4]);
aug[1] = (uint32)atoi(row[5]); aug[1] = (uint32)atoi(row[5]);
aug[2] = (uint32)atoi(row[6]); aug[2] = (uint32)atoi(row[6]);
aug[3] = (uint32)atoi(row[7]); aug[3] = (uint32)atoi(row[7]);
aug[4] = (uint32)atoi(row[8]); aug[4] = (uint32)atoi(row[8]);
bool instnodrop = (row[9] && (uint16)atoi(row[9])) ? true : false; bool instnodrop = (row[9] && (uint16)atoi(row[9])) ? true : false;
const Item_Struct* item = GetItem(item_id); const Item_Struct* item = GetItem(item_id);
int16 put_slot_id = INVALID_INDEX; int16 put_slot_id = INVALID_INDEX;
@ -635,66 +635,56 @@ bool SharedDatabase::GetInventory(uint32 account_id, char* name, Inventory* inv)
if(row[10]) { if(row[10]) {
std::string data_str(row[10]); std::string data_str(row[10]);
std::string id; std::string idAsString;
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(id, value); inst->SetCustomData(idAsString, value);
id.clear(); idAsString.clear();
value.clear(); value.clear();
} }
use_id = !use_id; use_id = !use_id;
continue;
} }
else {
char v = data_str[i]; char v = data_str[i];
if(use_id) { if(use_id)
id.push_back(v); idAsString.push_back(v);
} else { else
value.push_back(v); value.push_back(v);
}
}
} }
} }
if (color > 0) if (color > 0)
inst->SetColor(color); inst->SetColor(color);
inst->SetCharges(charges); inst->SetCharges(charges);
if (item->ItemClass == ItemClassCommon) { if (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 (slot_id>=8000 && slot_id <= 8999) if (slot_id>=8000 && slot_id <= 8999)
put_slot_id = inv->PushCursor(*inst); put_slot_id = inv->PushCursor(*inst);
else else
put_slot_id = inv->PutItem(slot_id, *inst); put_slot_id = inv->PutItem(slot_id, *inst);
safe_delete(inst); safe_delete(inst);
// Save ptr to item in inventory // Save ptr to item in inventory
if (put_slot_id == INVALID_INDEX) { if (put_slot_id == INVALID_INDEX)
LogFile->write(EQEMuLog::Error, LogFile->write(EQEMuLog::Error, "Warning: Invalid slot_id for item in inventory: name=%s, acctid=%i, item_id=%i, slot_id=%i", name, account_id, item_id, slot_id);
"Warning: Invalid slot_id for item in inventory: name=%s, acctid=%i, item_id=%i, slot_id=%i",
name, account_id, item_id, slot_id);
} }
}
mysql_free_result(result);
// Retrieve shared inventory // Retrieve shared inventory
ret = GetSharedBank(account_id, inv, false); return GetSharedBank(account_id, inv, false);
}
else {
LogFile->write(EQEMuLog::Error, "GetInventory query '%s' %s", query, errbuf);
LogFile->write(EQEMuLog::Error, "If you got an error related to the 'instnodrop' field, run the following SQL Queries:\nalter table inventory add instnodrop tinyint(1) unsigned default 0 not null;\n");
}
safe_delete_array(query);
return ret;
} }