Merge master to movement_manager, fix for merge failure

world/client.cpp

@@ -254,7 +254,7 @@ void Client::SendMembership() {
 	mc->entries[1] = 0xffffffff;	// Max Level Restriction
 	mc->entries[2] = 0xffffffff;	// Max Char Slots per Account (not used by client?)
 	mc->entries[3] = 0xffffffff;	// 1 for Silver
-	mc->entries[4] = 8;				// Main Inventory Size (0xffffffff on Live for Gold, but limiting to 8 until 10 is supported)
+	mc->entries[4] = 0xffffffff;	// Main Inventory Size (0xffffffff on Live for Gold, but limiting to 8 until 10 is supported)
 	mc->entries[5] = 0xffffffff;	// Max Platinum per level
 	mc->entries[6] = 1;				// 0 for Silver
 	mc->entries[7] = 1;				// 0 for Silver
@@ -1444,6 +1444,7 @@ bool Client::OPCharCreate(char *name, CharCreate_Struct *cc)
 	PlayerProfile_Struct pp;
 	ExtendedProfile_Struct ext;
 	EQEmu::InventoryProfile inv;
+	inv.SetInventoryVersion(EQEmu::versions::ConvertClientVersionBitToClientVersion(m_ClientVersionBit));
 	time_t bday = time(nullptr);
 	char startzone[50]={0};
 	uint32 i;

world/worlddb.cpp

@@ -97,6 +97,7 @@ void WorldDatabase::GetCharSelectInfo(uint32 accountID, EQApplicationPacket **ou
 		CharacterSelectEntry_Struct *cse = (CharacterSelectEntry_Struct *)buff_ptr;
 		PlayerProfile_Struct pp;
 		EQEmu::InventoryProfile inv;
+		inv.SetInventoryVersion(client_version);
 		uint32 character_id = (uint32)atoi(row[0]);
 		uint8 has_home = 0;
 		uint8 has_bind = 0;
@@ -243,7 +244,7 @@ void WorldDatabase::GetCharSelectInfo(uint32 accountID, EQApplicationPacket **ou
 
 		/* Load Inventory */
 		// If we ensure that the material data is updated appropriately, we can do away with inventory loads
-		if (GetInventory(accountID, cse->Name, &inv)) {
+		if (GetCharSelInventory(accountID, cse->Name, &inv)) {
 			const EQEmu::ItemData* item = nullptr;
 			const EQEmu::ItemInstance* inst = nullptr;
 			int16 invslot = 0;
@@ -590,3 +591,143 @@ bool WorldDatabase::LoadCharacterCreateCombos()
 
 	return true;
 }
+
+// this is a slightly modified version of SharedDatabase::GetInventory(...) for character select use-only
+bool WorldDatabase::GetCharSelInventory(uint32 account_id, char *name, EQEmu::InventoryProfile *inv)
+{
+	if (!account_id || !name || !inv)
+		return false;
+
+	std::string query = StringFormat(
+		"SELECT"
+		" slotid,"
+		" itemid,"
+		" charges,"
+		" color,"
+		" augslot1,"
+		" augslot2,"
+		" augslot3,"
+		" augslot4,"
+		" augslot5,"
+		" augslot6,"
+		" instnodrop,"
+		" custom_data,"
+		" ornamenticon,"
+		" ornamentidfile,"
+		" ornament_hero_model "
+		"FROM"
+		" inventory "
+		"INNER JOIN"
+		" character_data ch "
+		"ON"
+		" ch.id = charid "
+		"WHERE"
+		" ch.name = '%s' "
+		"AND"
+		" ch.account_id = %i "
+		"AND"
+		" slotid >= %i "
+		"AND"
+		" slotid <= %i",
+		name,
+		account_id,
+		EQEmu::invslot::slotHead,
+		EQEmu::invslot::slotFeet
+	);
+	auto results = QueryDatabase(query);
+	if (!results.Success())
+		return false;
+
+	for (auto row = results.begin(); row != results.end(); ++row) {
+		int16 slot_id = atoi(row[0]);
+
+		switch (slot_id) {
+		case EQEmu::invslot::slotFace:
+		case EQEmu::invslot::slotEar2:
+		case EQEmu::invslot::slotNeck:
+		case EQEmu::invslot::slotShoulders:
+		case EQEmu::invslot::slotBack:
+		case EQEmu::invslot::slotFinger1:
+		case EQEmu::invslot::slotFinger2:
+			continue;
+		default:
+			break;
+		}
+
+		uint32 item_id = atoi(row[1]);
+		int8 charges = atoi(row[2]);
+		uint32 color = atoul(row[3]);
+
+		uint32 aug[EQEmu::invaug::SOCKET_COUNT];
+		aug[0] = (uint32)atoi(row[4]);
+		aug[1] = (uint32)atoi(row[5]);
+		aug[2] = (uint32)atoi(row[6]);
+		aug[3] = (uint32)atoi(row[7]);
+		aug[4] = (uint32)atoi(row[8]);
+		aug[5] = (uint32)atoi(row[9]);
+
+		bool instnodrop = ((row[10] && (uint16)atoi(row[10])) ? true : false);
+		uint32 ornament_icon = (uint32)atoul(row[12]);
+		uint32 ornament_idfile = (uint32)atoul(row[13]);
+		uint32 ornament_hero_model = (uint32)atoul(row[14]);
+
+		const EQEmu::ItemData *item = GetItem(item_id);
+		if (!item)
+			continue;
+
+		EQEmu::ItemInstance *inst = CreateBaseItem(item, charges);
+
+		if (inst == nullptr)
+			continue;
+
+		inst->SetAttuned(instnodrop);
+
+		if (row[11]) {
+			std::string data_str(row[11]);
+			std::string idAsString;
+			std::string value;
+			bool use_id = true;
+
+			for (int i = 0; i < data_str.length(); ++i) {
+				if (data_str[i] == '^') {
+					if (!use_id) {
+						inst->SetCustomData(idAsString, value);
+						idAsString.clear();
+						value.clear();
+					}
+
+					use_id = !use_id;
+					continue;
+				}
+
+				char v = data_str[i];
+				if (use_id)
+					idAsString.push_back(v);
+				else
+					value.push_back(v);
+			}
+		}
+
+		inst->SetOrnamentIcon(ornament_icon);
+		inst->SetOrnamentationIDFile(ornament_idfile);
+		inst->SetOrnamentHeroModel(item->HerosForgeModel);
+
+		if (color > 0)
+			inst->SetColor(color);
+
+		inst->SetCharges(charges);
+
+		if (item->IsClassCommon()) {
+			for (int i = EQEmu::invaug::SOCKET_BEGIN; i <= EQEmu::invaug::SOCKET_END; i++) {
+				if (aug[i])
+					inst->PutAugment(this, i, aug[i]);
+			}
+		}
+
+		inv->PutItem(slot_id, *inst);
+
+		safe_delete(inst);
+	}
+
+	return true;
+}

world/worlddb.h

@@ -41,6 +41,8 @@ public:
 private:
 	void SetTitaniumDefaultStartZone(PlayerProfile_Struct* in_pp, CharCreate_Struct* in_cc);
 	void SetSoFDefaultStartZone(PlayerProfile_Struct* in_pp, CharCreate_Struct* in_cc);
+
+	bool GetCharSelInventory(uint32 account_id, char* name, EQEmu::InventoryProfile* inv);
 };
 
 extern WorldDatabase database;