pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-08-27 10:47:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix post merge issues

Browse Source
This commit is contained in:
Akkadius
2020-05-23 22:41:59 -05:00
parent 03a4254397
commit 56c4eb280f
8 changed files with 15 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files
world/client.cpp
+9 -9
View File
@@ -2078,7 +2078,7 @@ void Client::SetClassLanguages(PlayerProfile_Struct *pp)
bool Client::StoreCharacter(
uint32 account_id,
PlayerProfile_Struct *p_player_profile_struct,
EQEmu::InventoryProfile *p_inventory_profile
EQ::InventoryProfile *p_inventory_profile
)
{
uint32 character_id = 0;
@@ -2103,8 +2103,8 @@ bool Client::StoreCharacter(
database.SaveCharacterCreate(character_id, account_id, p_player_profile_struct);
std::string invquery;
for (int16 i = EQEmu::invslot::EQUIPMENT_BEGIN; i <= EQEmu::invbag::BANK_BAGS_END;) {
const EQEmu::ItemInstance *new_inventory_item = p_inventory_profile->GetItem(i);
for (int16 i = EQ::invslot::EQUIPMENT_BEGIN; i <= EQ::invbag::BANK_BAGS_END;) {
const EQ::ItemInstance *new_inventory_item = p_inventory_profile->GetItem(i);
if (new_inventory_item) {
invquery = StringFormat(
"INSERT INTO `inventory` (charid, slotid, itemid, charges, color) VALUES (%u, %i, %u, %i, %u)",
@@ -2118,16 +2118,16 @@ bool Client::StoreCharacter(
auto results = database.QueryDatabase(invquery);
}
if (i == EQEmu::invslot::slotCursor) {
i = EQEmu::invbag::GENERAL_BAGS_BEGIN;
if (i == EQ::invslot::slotCursor) {
i = EQ::invbag::GENERAL_BAGS_BEGIN;
continue;
}
else if (i == EQEmu::invbag::CURSOR_BAG_END) {
i = EQEmu::invslot::BANK_BEGIN;
else if (i == EQ::invbag::CURSOR_BAG_END) {
i = EQ::invslot::BANK_BEGIN;
continue;
}
else if (i == EQEmu::invslot::BANK_END) {
i = EQEmu::invbag::BANK_BAGS_BEGIN;
else if (i == EQ::invslot::BANK_END) {
i = EQ::invbag::BANK_BAGS_BEGIN;
continue;
}
i++;