From 011d7a6a299f5febf6686c8eb989d31114cf1499 Mon Sep 17 00:00:00 2001 From: Uleat Date: Mon, 7 Jan 2019 00:11:07 -0500 Subject: [PATCH] Updated EQDictionary entries to allow ease of reading and gui tooltip propagation --- common/eq_limits.cpp | 1008 +++++++++++++--------------------- common/eq_limits.h | 70 ++- common/inventory_profile.cpp | 22 +- common/shareddb.cpp | 2 +- zone/corpse.cpp | 2 +- zone/inventory.cpp | 30 +- 6 files changed, 467 insertions(+), 667 deletions(-) diff --git a/common/eq_limits.cpp b/common/eq_limits.cpp index 0265a8a42..9d37946cc 100644 --- a/common/eq_limits.cpp +++ b/common/eq_limits.cpp @@ -23,7 +23,8 @@ static const EQEmu::constants::LookupEntry constants_lookup_entries[EQEmu::versions::ClientVersionCount] = { - { + /*[ClientVersion::Unknown] =*/ + EQEmu::constants::LookupEntry() = { ClientUnknown::INULL, ClientUnknown::INULL, ClientUnknown::INULL, @@ -33,7 +34,8 @@ static const EQEmu::constants::LookupEntry constants_lookup_entries[EQEmu::versi ClientUnknown::INULL, ClientUnknown::INULL }, - { + /*[ClientVersion::Client62] =*/ + EQEmu::constants::LookupEntry() = { Client62::INULL, Client62::INULL, Client62::INULL, @@ -43,7 +45,8 @@ static const EQEmu::constants::LookupEntry constants_lookup_entries[EQEmu::versi Client62::INULL, Client62::INULL }, - { + /*[ClientVersion::Titanium] =*/ + EQEmu::constants::LookupEntry() = { Titanium::constants::CHARACTER_CREATION_LIMIT, Titanium::constants::LongBuffs, Titanium::constants::ShortBuffs, @@ -53,7 +56,8 @@ static const EQEmu::constants::LookupEntry constants_lookup_entries[EQEmu::versi Titanium::constants::PetBuffs, Titanium::constants::MercBuffs }, - { + /*[ClientVersion::SoF] =*/ + EQEmu::constants::LookupEntry() = { SoF::constants::CHARACTER_CREATION_LIMIT, SoF::constants::LongBuffs, SoF::constants::ShortBuffs, @@ -63,7 +67,8 @@ static const EQEmu::constants::LookupEntry constants_lookup_entries[EQEmu::versi SoF::constants::PetBuffs, SoF::constants::MercBuffs }, - { + /*[ClientVersion::SoD] =*/ + EQEmu::constants::LookupEntry() = { SoD::constants::CHARACTER_CREATION_LIMIT, SoD::constants::LongBuffs, SoD::constants::ShortBuffs, @@ -73,7 +78,8 @@ static const EQEmu::constants::LookupEntry constants_lookup_entries[EQEmu::versi SoD::constants::PetBuffs, SoD::constants::MercBuffs }, - { + /*[ClientVersion::UF] =*/ + EQEmu::constants::LookupEntry() = { UF::constants::CHARACTER_CREATION_LIMIT, UF::constants::LongBuffs, UF::constants::ShortBuffs, @@ -83,7 +89,8 @@ static const EQEmu::constants::LookupEntry constants_lookup_entries[EQEmu::versi UF::constants::PetBuffs, UF::constants::MercBuffs }, - { + /*[ClientVersion::RoF] =*/ + EQEmu::constants::LookupEntry() = { RoF::constants::CHARACTER_CREATION_LIMIT, RoF::constants::LongBuffs, RoF::constants::ShortBuffs, @@ -93,7 +100,8 @@ static const EQEmu::constants::LookupEntry constants_lookup_entries[EQEmu::versi RoF::constants::PetBuffs, RoF::constants::MercBuffs }, - { + /*[ClientVersion::RoF2] =*/ + EQEmu::constants::LookupEntry() = { RoF2::constants::CHARACTER_CREATION_LIMIT, RoF2::constants::LongBuffs, RoF2::constants::ShortBuffs, @@ -112,180 +120,115 @@ const EQEmu::constants::LookupEntry* EQEmu::constants::Lookup(versions::ClientVe static const EQEmu::inventory::LookupEntry inventory_lookup_entries[EQEmu::versions::MobVersionCount] = { - { + /*[MobVersion::Unknown] =*/ + EQEmu::inventory::LookupEntry( + EQEmu::inventory::LookupEntry::InventoryTypeSize_Struct( + ClientUnknown::INULL, ClientUnknown::INULL, ClientUnknown::INULL, + ClientUnknown::INULL, ClientUnknown::INULL, ClientUnknown::INULL, + ClientUnknown::INULL, ClientUnknown::INULL, ClientUnknown::INULL, + ClientUnknown::INULL, ClientUnknown::INULL, ClientUnknown::INULL, + ClientUnknown::INULL, ClientUnknown::INULL, ClientUnknown::INULL, + ClientUnknown::INULL, ClientUnknown::INULL, ClientUnknown::INULL, + ClientUnknown::INULL, ClientUnknown::INULL, ClientUnknown::INULL, + ClientUnknown::INULL, ClientUnknown::INULL, ClientUnknown::INULL, + ClientUnknown::INULL + ), + ClientUnknown::INULL, ClientUnknown::INULL, ClientUnknown::INULL, ClientUnknown::INULL, - ClientUnknown::INULL, - ClientUnknown::INULL, - ClientUnknown::INULL, - ClientUnknown::INULL, - ClientUnknown::INULL, - ClientUnknown::INULL, - ClientUnknown::INULL, - ClientUnknown::INULL, - ClientUnknown::INULL, - ClientUnknown::INULL, - ClientUnknown::INULL, - ClientUnknown::INULL, - ClientUnknown::INULL, - ClientUnknown::INULL, - ClientUnknown::INULL, - ClientUnknown::INULL, - ClientUnknown::INULL, - ClientUnknown::INULL, - ClientUnknown::INULL, - ClientUnknown::INULL, - ClientUnknown::INULL, - - ClientUnknown::INULL, - ClientUnknown::INULL, - ClientUnknown::INULL, - ClientUnknown::INULL, - + false, false, false, false - }, - { + ), + /*[MobVersion::Client62] =*/ + EQEmu::inventory::LookupEntry( + EQEmu::inventory::LookupEntry::InventoryTypeSize_Struct( + Client62::INULL, Client62::INULL, Client62::INULL, + Client62::INULL, Client62::INULL, Client62::INULL, + Client62::INULL, Client62::INULL, Client62::INULL, + Client62::INULL, Client62::INULL, Client62::INULL, + Client62::INULL, Client62::INULL, Client62::INULL, + Client62::INULL, Client62::INULL, Client62::INULL, + Client62::INULL, Client62::INULL, Client62::INULL, + Client62::INULL, Client62::INULL, Client62::INULL, + Client62::INULL + ), + Client62::INULL, Client62::INULL, Client62::INULL, Client62::INULL, - Client62::INULL, - Client62::INULL, - Client62::INULL, - Client62::INULL, - Client62::INULL, - Client62::INULL, - Client62::INULL, - Client62::INULL, - Client62::INULL, - Client62::INULL, - Client62::INULL, - Client62::INULL, - Client62::INULL, - Client62::INULL, - Client62::INULL, - Client62::INULL, - Client62::INULL, - Client62::INULL, - Client62::INULL, - Client62::INULL, - Client62::INULL, - - Client62::INULL, - Client62::INULL, - Client62::INULL, - Client62::INULL, - + false, false, false, false - }, - { - EQEmu::invtype::POSSESSIONS_SIZE, - Titanium::invtype::BANK_SIZE, - Titanium::invtype::SHARED_BANK_SIZE, - Titanium::invtype::TRADE_SIZE, - Titanium::invtype::WORLD_SIZE, - Titanium::invtype::LIMBO_SIZE, - Titanium::invtype::TRIBUTE_SIZE, - Titanium::INULL, - Titanium::invtype::GUILD_TRIBUTE_SIZE, - Titanium::invtype::MERCHANT_SIZE, - Titanium::INULL, - Titanium::invtype::CORPSE_SIZE, - Titanium::invtype::BAZAAR_SIZE, - Titanium::invtype::INSPECT_SIZE, - Titanium::INULL, - Titanium::invtype::VIEW_MOD_PC_SIZE, - Titanium::invtype::VIEW_MOD_BANK_SIZE, - Titanium::invtype::VIEW_MOD_SHARED_BANK_SIZE, - Titanium::invtype::VIEW_MOD_LIMBO_SIZE, - Titanium::invtype::ALT_STORAGE_SIZE, - Titanium::invtype::ARCHIVED_SIZE, - Titanium::INULL, - Titanium::INULL, - Titanium::INULL, - Titanium::invtype::OTHER_SIZE, - + ), + /*[MobVersion::Titanium] =*/ + EQEmu::inventory::LookupEntry( + EQEmu::inventory::LookupEntry::InventoryTypeSize_Struct( + EQEmu::invtype::POSSESSIONS_SIZE, Titanium::invtype::BANK_SIZE, Titanium::invtype::SHARED_BANK_SIZE, + Titanium::invtype::TRADE_SIZE, Titanium::invtype::WORLD_SIZE, Titanium::invtype::LIMBO_SIZE, + Titanium::invtype::TRIBUTE_SIZE, Titanium::INULL, Titanium::invtype::GUILD_TRIBUTE_SIZE, + Titanium::invtype::MERCHANT_SIZE, Titanium::INULL, Titanium::invtype::CORPSE_SIZE, + Titanium::invtype::BAZAAR_SIZE, Titanium::invtype::INSPECT_SIZE, Titanium::INULL, + Titanium::invtype::VIEW_MOD_PC_SIZE, Titanium::invtype::VIEW_MOD_BANK_SIZE, Titanium::invtype::VIEW_MOD_SHARED_BANK_SIZE, + Titanium::invtype::VIEW_MOD_LIMBO_SIZE, Titanium::invtype::ALT_STORAGE_SIZE, Titanium::invtype::ARCHIVED_SIZE, + Titanium::INULL, Titanium::INULL, Titanium::INULL, + Titanium::invtype::OTHER_SIZE + ), + Titanium::invslot::POSSESSIONS_BITMASK, Titanium::invslot::CORPSE_BITMASK, Titanium::invbag::SLOT_COUNT, Titanium::invaug::SOCKET_COUNT, - + Titanium::inventory::AllowEmptyBagInBag, Titanium::inventory::AllowClickCastFromBag, Titanium::inventory::ConcatenateInvTypeLimbo, Titanium::inventory::AllowOverLevelEquipment - }, - { - EQEmu::invtype::POSSESSIONS_SIZE, - SoF::invtype::BANK_SIZE, - SoF::invtype::SHARED_BANK_SIZE, - SoF::invtype::TRADE_SIZE, - SoF::invtype::WORLD_SIZE, - SoF::invtype::LIMBO_SIZE, - SoF::invtype::TRIBUTE_SIZE, - SoF::INULL, - SoF::invtype::GUILD_TRIBUTE_SIZE, - SoF::invtype::MERCHANT_SIZE, - SoF::INULL, - SoF::invtype::CORPSE_SIZE, - SoF::invtype::BAZAAR_SIZE, - SoF::invtype::INSPECT_SIZE, - SoF::INULL, - SoF::invtype::VIEW_MOD_PC_SIZE, - SoF::invtype::VIEW_MOD_BANK_SIZE, - SoF::invtype::VIEW_MOD_SHARED_BANK_SIZE, - SoF::invtype::VIEW_MOD_LIMBO_SIZE, - SoF::invtype::ALT_STORAGE_SIZE, - SoF::invtype::ARCHIVED_SIZE, - SoF::INULL, - SoF::INULL, - SoF::INULL, - SoF::invtype::OTHER_SIZE, - + ), + /*[MobVersion::SoF] =*/ + EQEmu::inventory::LookupEntry( + EQEmu::inventory::LookupEntry::InventoryTypeSize_Struct( + EQEmu::invtype::POSSESSIONS_SIZE, SoF::invtype::BANK_SIZE, SoF::invtype::SHARED_BANK_SIZE, + SoF::invtype::TRADE_SIZE, SoF::invtype::WORLD_SIZE, SoF::invtype::LIMBO_SIZE, + SoF::invtype::TRIBUTE_SIZE, SoF::INULL, SoF::invtype::GUILD_TRIBUTE_SIZE, + SoF::invtype::MERCHANT_SIZE, SoF::INULL, SoF::invtype::CORPSE_SIZE, + SoF::invtype::BAZAAR_SIZE, SoF::invtype::INSPECT_SIZE, SoF::INULL, + SoF::invtype::VIEW_MOD_PC_SIZE, SoF::invtype::VIEW_MOD_BANK_SIZE, SoF::invtype::VIEW_MOD_SHARED_BANK_SIZE, + SoF::invtype::VIEW_MOD_LIMBO_SIZE, SoF::invtype::ALT_STORAGE_SIZE, SoF::invtype::ARCHIVED_SIZE, + SoF::INULL, SoF::INULL, SoF::INULL, + SoF::invtype::OTHER_SIZE + ), + SoF::invslot::POSSESSIONS_BITMASK, SoF::invslot::CORPSE_BITMASK, SoF::invbag::SLOT_COUNT, SoF::invaug::SOCKET_COUNT, - + SoF::inventory::AllowEmptyBagInBag, SoF::inventory::AllowClickCastFromBag, SoF::inventory::ConcatenateInvTypeLimbo, SoF::inventory::AllowOverLevelEquipment - }, - { - EQEmu::invtype::POSSESSIONS_SIZE, - SoD::invtype::BANK_SIZE, - SoD::invtype::SHARED_BANK_SIZE, - SoD::invtype::TRADE_SIZE, - SoD::invtype::WORLD_SIZE, - SoD::invtype::LIMBO_SIZE, - SoD::invtype::TRIBUTE_SIZE, - SoD::INULL, - SoD::invtype::GUILD_TRIBUTE_SIZE, - SoD::invtype::MERCHANT_SIZE, - SoD::INULL, - SoD::invtype::CORPSE_SIZE, - SoD::invtype::BAZAAR_SIZE, - SoD::invtype::INSPECT_SIZE, - SoD::INULL, - SoD::invtype::VIEW_MOD_PC_SIZE, - SoD::invtype::VIEW_MOD_BANK_SIZE, - SoD::invtype::VIEW_MOD_SHARED_BANK_SIZE, - SoD::invtype::VIEW_MOD_LIMBO_SIZE, - SoD::invtype::ALT_STORAGE_SIZE, - SoD::invtype::ARCHIVED_SIZE, - SoD::INULL, - SoD::INULL, - SoD::INULL, - SoD::invtype::OTHER_SIZE, + ), + /*[MobVersion::SoD] =*/ + EQEmu::inventory::LookupEntry( + EQEmu::inventory::LookupEntry::InventoryTypeSize_Struct( + EQEmu::invtype::POSSESSIONS_SIZE, SoD::invtype::BANK_SIZE, SoD::invtype::SHARED_BANK_SIZE, + SoD::invtype::TRADE_SIZE, SoD::invtype::WORLD_SIZE, SoD::invtype::LIMBO_SIZE, + SoD::invtype::TRIBUTE_SIZE, SoD::INULL, SoD::invtype::GUILD_TRIBUTE_SIZE, + SoD::invtype::MERCHANT_SIZE, SoD::INULL, SoD::invtype::CORPSE_SIZE, + SoD::invtype::BAZAAR_SIZE, SoD::invtype::INSPECT_SIZE, SoD::INULL, + SoD::invtype::VIEW_MOD_PC_SIZE, SoD::invtype::VIEW_MOD_BANK_SIZE, SoD::invtype::VIEW_MOD_SHARED_BANK_SIZE, + SoD::invtype::VIEW_MOD_LIMBO_SIZE, SoD::invtype::ALT_STORAGE_SIZE, SoD::invtype::ARCHIVED_SIZE, + SoD::INULL, SoD::INULL, SoD::INULL, + SoD::invtype::OTHER_SIZE + ), SoD::invslot::POSSESSIONS_BITMASK, SoD::invslot::CORPSE_BITMASK, @@ -296,33 +239,20 @@ static const EQEmu::inventory::LookupEntry inventory_lookup_entries[EQEmu::versi SoD::inventory::AllowClickCastFromBag, SoD::inventory::ConcatenateInvTypeLimbo, SoD::inventory::AllowOverLevelEquipment - }, - { - EQEmu::invtype::POSSESSIONS_SIZE, - UF::invtype::BANK_SIZE, - UF::invtype::SHARED_BANK_SIZE, - UF::invtype::TRADE_SIZE, - UF::invtype::WORLD_SIZE, - UF::invtype::LIMBO_SIZE, - UF::invtype::TRIBUTE_SIZE, - UF::INULL, - UF::invtype::GUILD_TRIBUTE_SIZE, - UF::invtype::MERCHANT_SIZE, - UF::INULL, - UF::invtype::CORPSE_SIZE, - UF::invtype::BAZAAR_SIZE, - UF::invtype::INSPECT_SIZE, - UF::INULL, - UF::invtype::VIEW_MOD_PC_SIZE, - UF::invtype::VIEW_MOD_BANK_SIZE, - UF::invtype::VIEW_MOD_SHARED_BANK_SIZE, - UF::invtype::VIEW_MOD_LIMBO_SIZE, - UF::invtype::ALT_STORAGE_SIZE, - UF::invtype::ARCHIVED_SIZE, - UF::INULL, - UF::INULL, - UF::INULL, - UF::invtype::OTHER_SIZE, + ), + /*[MobVersion::UF] =*/ + EQEmu::inventory::LookupEntry( + EQEmu::inventory::LookupEntry::InventoryTypeSize_Struct( + EQEmu::invtype::POSSESSIONS_SIZE, UF::invtype::BANK_SIZE, UF::invtype::SHARED_BANK_SIZE, + UF::invtype::TRADE_SIZE, UF::invtype::WORLD_SIZE, UF::invtype::LIMBO_SIZE, + UF::invtype::TRIBUTE_SIZE, UF::INULL, UF::invtype::GUILD_TRIBUTE_SIZE, + UF::invtype::MERCHANT_SIZE, UF::INULL, UF::invtype::CORPSE_SIZE, + UF::invtype::BAZAAR_SIZE, UF::invtype::INSPECT_SIZE, UF::INULL, + UF::invtype::VIEW_MOD_PC_SIZE, UF::invtype::VIEW_MOD_BANK_SIZE, UF::invtype::VIEW_MOD_SHARED_BANK_SIZE, + UF::invtype::VIEW_MOD_LIMBO_SIZE, UF::invtype::ALT_STORAGE_SIZE, UF::invtype::ARCHIVED_SIZE, + UF::INULL, UF::INULL, UF::INULL, + UF::invtype::OTHER_SIZE + ), UF::invslot::POSSESSIONS_BITMASK, UF::invslot::CORPSE_BITMASK, @@ -333,33 +263,20 @@ static const EQEmu::inventory::LookupEntry inventory_lookup_entries[EQEmu::versi UF::inventory::AllowClickCastFromBag, UF::inventory::ConcatenateInvTypeLimbo, UF::inventory::AllowOverLevelEquipment - }, - { - EQEmu::invtype::POSSESSIONS_SIZE, - RoF::invtype::BANK_SIZE, - RoF::invtype::SHARED_BANK_SIZE, - RoF::invtype::TRADE_SIZE, - RoF::invtype::WORLD_SIZE, - RoF::invtype::LIMBO_SIZE, - RoF::invtype::TRIBUTE_SIZE, - RoF::invtype::TROPHY_TRIBUTE_SIZE, - RoF::invtype::GUILD_TRIBUTE_SIZE, - RoF::invtype::MERCHANT_SIZE, - RoF::invtype::DELETED_SIZE, - RoF::invtype::CORPSE_SIZE, - RoF::invtype::BAZAAR_SIZE, - RoF::invtype::INSPECT_SIZE, - RoF::invtype::REAL_ESTATE_SIZE, - RoF::invtype::VIEW_MOD_PC_SIZE, - RoF::invtype::VIEW_MOD_BANK_SIZE, - RoF::invtype::VIEW_MOD_SHARED_BANK_SIZE, - RoF::invtype::VIEW_MOD_LIMBO_SIZE, - RoF::invtype::ALT_STORAGE_SIZE, - RoF::invtype::ARCHIVED_SIZE, - RoF::invtype::MAIL_SIZE, - RoF::invtype::GUILD_TROPHY_TRIBUTE_SIZE, - RoF::INULL, - RoF::invtype::OTHER_SIZE, + ), + /*[MobVersion::RoF] =*/ + EQEmu::inventory::LookupEntry( + EQEmu::inventory::LookupEntry::InventoryTypeSize_Struct( + EQEmu::invtype::POSSESSIONS_SIZE, RoF::invtype::BANK_SIZE, RoF::invtype::SHARED_BANK_SIZE, + RoF::invtype::TRADE_SIZE, RoF::invtype::WORLD_SIZE, RoF::invtype::LIMBO_SIZE, + RoF::invtype::TRIBUTE_SIZE, RoF::invtype::TROPHY_TRIBUTE_SIZE, RoF::invtype::GUILD_TRIBUTE_SIZE, + RoF::invtype::MERCHANT_SIZE, RoF::invtype::DELETED_SIZE, RoF::invtype::CORPSE_SIZE, + RoF::invtype::BAZAAR_SIZE, RoF::invtype::INSPECT_SIZE, RoF::invtype::REAL_ESTATE_SIZE, + RoF::invtype::VIEW_MOD_PC_SIZE, RoF::invtype::VIEW_MOD_BANK_SIZE, RoF::invtype::VIEW_MOD_SHARED_BANK_SIZE, + RoF::invtype::VIEW_MOD_LIMBO_SIZE, RoF::invtype::ALT_STORAGE_SIZE, RoF::invtype::ARCHIVED_SIZE, + RoF::invtype::MAIL_SIZE, RoF::invtype::GUILD_TROPHY_TRIBUTE_SIZE, RoF::INULL, + RoF::invtype::OTHER_SIZE + ), RoF::invslot::POSSESSIONS_BITMASK, RoF::invslot::CORPSE_BITMASK, @@ -370,33 +287,20 @@ static const EQEmu::inventory::LookupEntry inventory_lookup_entries[EQEmu::versi RoF::inventory::AllowClickCastFromBag, RoF::inventory::ConcatenateInvTypeLimbo, RoF::inventory::AllowOverLevelEquipment - }, - { - EQEmu::invtype::POSSESSIONS_SIZE, - RoF2::invtype::BANK_SIZE, - RoF2::invtype::SHARED_BANK_SIZE, - RoF2::invtype::TRADE_SIZE, - RoF2::invtype::WORLD_SIZE, - RoF2::invtype::LIMBO_SIZE, - RoF2::invtype::TRIBUTE_SIZE, - RoF2::invtype::TROPHY_TRIBUTE_SIZE, - RoF2::invtype::GUILD_TRIBUTE_SIZE, - RoF2::invtype::MERCHANT_SIZE, - RoF2::invtype::DELETED_SIZE, - RoF2::invtype::CORPSE_SIZE, - RoF2::invtype::BAZAAR_SIZE, - RoF2::invtype::INSPECT_SIZE, - RoF2::invtype::REAL_ESTATE_SIZE, - RoF2::invtype::VIEW_MOD_PC_SIZE, - RoF2::invtype::VIEW_MOD_BANK_SIZE, - RoF2::invtype::VIEW_MOD_SHARED_BANK_SIZE, - RoF2::invtype::VIEW_MOD_LIMBO_SIZE, - RoF2::invtype::ALT_STORAGE_SIZE, - RoF2::invtype::ARCHIVED_SIZE, - RoF2::invtype::MAIL_SIZE, - RoF2::invtype::GUILD_TROPHY_TRIBUTE_SIZE, - RoF2::invtype::KRONO_SIZE, - RoF2::invtype::OTHER_SIZE, + ), + /*[MobVersion::RoF2] =*/ + EQEmu::inventory::LookupEntry( + EQEmu::inventory::LookupEntry::InventoryTypeSize_Struct( + EQEmu::invtype::POSSESSIONS_SIZE, RoF2::invtype::BANK_SIZE, RoF2::invtype::SHARED_BANK_SIZE, + RoF2::invtype::TRADE_SIZE, RoF2::invtype::WORLD_SIZE, RoF2::invtype::LIMBO_SIZE, + RoF2::invtype::TRIBUTE_SIZE, RoF2::invtype::TROPHY_TRIBUTE_SIZE, RoF2::invtype::GUILD_TRIBUTE_SIZE, + RoF2::invtype::MERCHANT_SIZE, RoF2::invtype::DELETED_SIZE, RoF2::invtype::CORPSE_SIZE, + RoF2::invtype::BAZAAR_SIZE, RoF2::invtype::INSPECT_SIZE, RoF2::invtype::REAL_ESTATE_SIZE, + RoF2::invtype::VIEW_MOD_PC_SIZE, RoF2::invtype::VIEW_MOD_BANK_SIZE, RoF2::invtype::VIEW_MOD_SHARED_BANK_SIZE, + RoF2::invtype::VIEW_MOD_LIMBO_SIZE, RoF2::invtype::ALT_STORAGE_SIZE, RoF2::invtype::ARCHIVED_SIZE, + RoF2::invtype::MAIL_SIZE, RoF2::invtype::GUILD_TROPHY_TRIBUTE_SIZE, RoF2::invtype::KRONO_SIZE, + RoF2::invtype::OTHER_SIZE + ), RoF2::invslot::POSSESSIONS_BITMASK, RoF2::invslot::CORPSE_BITMASK, @@ -407,33 +311,20 @@ static const EQEmu::inventory::LookupEntry inventory_lookup_entries[EQEmu::versi RoF2::inventory::AllowClickCastFromBag, RoF2::inventory::ConcatenateInvTypeLimbo, RoF2::inventory::AllowOverLevelEquipment - }, - { - EQEmu::invtype::POSSESSIONS_SIZE, - EntityLimits::NPC::INULL, - EntityLimits::NPC::INULL, - EntityLimits::NPC::invtype::TRADE_SIZE, - EntityLimits::NPC::INULL, - EntityLimits::NPC::INULL, - EntityLimits::NPC::INULL, - EntityLimits::NPC::INULL, - EntityLimits::NPC::INULL, - EntityLimits::NPC::INULL, - EntityLimits::NPC::INULL, - EntityLimits::NPC::INULL, /*InvTypeCorpseSize,*/ - EntityLimits::NPC::INULL, - EntityLimits::NPC::INULL, - EntityLimits::NPC::INULL, - EntityLimits::NPC::INULL, - EntityLimits::NPC::INULL, - EntityLimits::NPC::INULL, - EntityLimits::NPC::INULL, - EntityLimits::NPC::INULL, - EntityLimits::NPC::INULL, - EntityLimits::NPC::INULL, - EntityLimits::NPC::INULL, - EntityLimits::NPC::INULL, - EntityLimits::NPC::INULL, + ), + /*[MobVersion::NPC] =*/ + EQEmu::inventory::LookupEntry( + EQEmu::inventory::LookupEntry::InventoryTypeSize_Struct( + EQEmu::invtype::POSSESSIONS_SIZE, EntityLimits::NPC::INULL, EntityLimits::NPC::INULL, + EntityLimits::NPC::invtype::TRADE_SIZE, EntityLimits::NPC::INULL, EntityLimits::NPC::INULL, + EntityLimits::NPC::INULL, EntityLimits::NPC::INULL, EntityLimits::NPC::INULL, + EntityLimits::NPC::INULL, EntityLimits::NPC::INULL, EntityLimits::NPC::INULL, /*InvTypeCorpseSize,*/ + EntityLimits::NPC::INULL, EntityLimits::NPC::INULL, EntityLimits::NPC::INULL, + EntityLimits::NPC::INULL, EntityLimits::NPC::INULL, EntityLimits::NPC::INULL, + EntityLimits::NPC::INULL, EntityLimits::NPC::INULL, EntityLimits::NPC::INULL, + EntityLimits::NPC::INULL, EntityLimits::NPC::INULL, EntityLimits::NPC::INULL, + EntityLimits::NPC::INULL + ), EntityLimits::NPC::INULL, EntityLimits::NPC::INULL, @@ -444,33 +335,20 @@ static const EQEmu::inventory::LookupEntry inventory_lookup_entries[EQEmu::versi false, false, false - }, - { - EQEmu::invtype::POSSESSIONS_SIZE, /*InvTypePossessionsSize,*/ - EntityLimits::NPCMerchant::INULL, - EntityLimits::NPCMerchant::INULL, - EntityLimits::NPCMerchant::invtype::TRADE_SIZE, - EntityLimits::NPCMerchant::INULL, - EntityLimits::NPCMerchant::INULL, - EntityLimits::NPCMerchant::INULL, - EntityLimits::NPCMerchant::INULL, - EntityLimits::NPCMerchant::INULL, - EntityLimits::NPCMerchant::INULL, - EntityLimits::NPCMerchant::INULL, - EntityLimits::NPCMerchant::INULL, /*InvTypeCorpseSize,*/ - EntityLimits::NPCMerchant::INULL, - EntityLimits::NPCMerchant::INULL, - EntityLimits::NPCMerchant::INULL, - EntityLimits::NPCMerchant::INULL, - EntityLimits::NPCMerchant::INULL, - EntityLimits::NPCMerchant::INULL, - EntityLimits::NPCMerchant::INULL, - EntityLimits::NPCMerchant::INULL, - EntityLimits::NPCMerchant::INULL, - EntityLimits::NPCMerchant::INULL, - EntityLimits::NPCMerchant::INULL, - EntityLimits::NPCMerchant::INULL, - EntityLimits::NPCMerchant::INULL, + ), + /*[MobVersion::NPCMerchant] =*/ + EQEmu::inventory::LookupEntry( + EQEmu::inventory::LookupEntry::InventoryTypeSize_Struct( + EQEmu::invtype::POSSESSIONS_SIZE, /*InvTypePossessionsSize,*/ EntityLimits::NPCMerchant::INULL, EntityLimits::NPCMerchant::INULL, + EntityLimits::NPCMerchant::invtype::TRADE_SIZE, EntityLimits::NPCMerchant::INULL, EntityLimits::NPCMerchant::INULL, + EntityLimits::NPCMerchant::INULL, EntityLimits::NPCMerchant::INULL, EntityLimits::NPCMerchant::INULL, + EntityLimits::NPCMerchant::INULL, EntityLimits::NPCMerchant::INULL, EntityLimits::NPCMerchant::INULL, /*InvTypeCorpseSize,*/ + EntityLimits::NPCMerchant::INULL, EntityLimits::NPCMerchant::INULL, EntityLimits::NPCMerchant::INULL, + EntityLimits::NPCMerchant::INULL, EntityLimits::NPCMerchant::INULL, EntityLimits::NPCMerchant::INULL, + EntityLimits::NPCMerchant::INULL, EntityLimits::NPCMerchant::INULL, EntityLimits::NPCMerchant::INULL, + EntityLimits::NPCMerchant::INULL, EntityLimits::NPCMerchant::INULL, EntityLimits::NPCMerchant::INULL, + EntityLimits::NPCMerchant::INULL + ), EntityLimits::NPCMerchant::INULL, EntityLimits::NPCMerchant::INULL, @@ -481,33 +359,20 @@ static const EQEmu::inventory::LookupEntry inventory_lookup_entries[EQEmu::versi false, false, false - }, - { - EQEmu::invtype::POSSESSIONS_SIZE, /*InvTypePossessionsSize,*/ - EntityLimits::Merc::INULL, - EntityLimits::Merc::INULL, - EntityLimits::Merc::invtype::TRADE_SIZE, - EntityLimits::Merc::INULL, - EntityLimits::Merc::INULL, - EntityLimits::Merc::INULL, - EntityLimits::Merc::INULL, - EntityLimits::Merc::INULL, - EntityLimits::Merc::INULL, - EntityLimits::Merc::INULL, - EntityLimits::Merc::INULL, /*InvTypeCorpseSize,*/ - EntityLimits::Merc::INULL, - EntityLimits::Merc::INULL, - EntityLimits::Merc::INULL, - EntityLimits::Merc::INULL, - EntityLimits::Merc::INULL, - EntityLimits::Merc::INULL, - EntityLimits::Merc::INULL, - EntityLimits::Merc::INULL, - EntityLimits::Merc::INULL, - EntityLimits::Merc::INULL, - EntityLimits::Merc::INULL, - EntityLimits::Merc::INULL, - EntityLimits::Merc::INULL, + ), + /*[MobVersion::Merc] =*/ + EQEmu::inventory::LookupEntry( + EQEmu::inventory::LookupEntry::InventoryTypeSize_Struct( + EQEmu::invtype::POSSESSIONS_SIZE, /*InvTypePossessionsSize,*/ EntityLimits::Merc::INULL, EntityLimits::Merc::INULL, + EntityLimits::Merc::invtype::TRADE_SIZE, EntityLimits::Merc::INULL, EntityLimits::Merc::INULL, + EntityLimits::Merc::INULL, EntityLimits::Merc::INULL, EntityLimits::Merc::INULL, + EntityLimits::Merc::INULL, EntityLimits::Merc::INULL, EntityLimits::Merc::INULL, /*InvTypeCorpseSize,*/ + EntityLimits::Merc::INULL, EntityLimits::Merc::INULL, EntityLimits::Merc::INULL, + EntityLimits::Merc::INULL, EntityLimits::Merc::INULL, EntityLimits::Merc::INULL, + EntityLimits::Merc::INULL, EntityLimits::Merc::INULL, EntityLimits::Merc::INULL, + EntityLimits::Merc::INULL, EntityLimits::Merc::INULL, EntityLimits::Merc::INULL, + EntityLimits::Merc::INULL + ), EntityLimits::Merc::INULL, EntityLimits::Merc::INULL, @@ -518,33 +383,20 @@ static const EQEmu::inventory::LookupEntry inventory_lookup_entries[EQEmu::versi false, false, false - }, - { - EQEmu::invtype::POSSESSIONS_SIZE, /*InvTypePossessionsSize,*/ - EntityLimits::Bot::INULL, - EntityLimits::Bot::INULL, - EntityLimits::Bot::invtype::TRADE_SIZE, - EntityLimits::Bot::INULL, - EntityLimits::Bot::INULL, - EntityLimits::Bot::INULL, - EntityLimits::Bot::INULL, - EntityLimits::Bot::INULL, - EntityLimits::Bot::INULL, - EntityLimits::Bot::INULL, - EntityLimits::Bot::INULL, /*InvTypeCorpseSize,*/ - EntityLimits::Bot::INULL, - EntityLimits::Bot::INULL, - EntityLimits::Bot::INULL, - EntityLimits::Bot::INULL, - EntityLimits::Bot::INULL, - EntityLimits::Bot::INULL, - EntityLimits::Bot::INULL, - EntityLimits::Bot::INULL, - EntityLimits::Bot::INULL, - EntityLimits::Bot::INULL, - EntityLimits::Bot::INULL, - EntityLimits::Bot::INULL, - EntityLimits::Bot::INULL, + ), + /*[MobVersion::Bot] =*/ + EQEmu::inventory::LookupEntry( + EQEmu::inventory::LookupEntry::InventoryTypeSize_Struct( + EQEmu::invtype::POSSESSIONS_SIZE, /*InvTypePossessionsSize,*/ EntityLimits::Bot::INULL, EntityLimits::Bot::INULL, + EntityLimits::Bot::invtype::TRADE_SIZE, EntityLimits::Bot::INULL, EntityLimits::Bot::INULL, + EntityLimits::Bot::INULL, EntityLimits::Bot::INULL, EntityLimits::Bot::INULL, + EntityLimits::Bot::INULL, EntityLimits::Bot::INULL, EntityLimits::Bot::INULL, /*InvTypeCorpseSize,*/ + EntityLimits::Bot::INULL, EntityLimits::Bot::INULL, EntityLimits::Bot::INULL, + EntityLimits::Bot::INULL, EntityLimits::Bot::INULL, EntityLimits::Bot::INULL, + EntityLimits::Bot::INULL, EntityLimits::Bot::INULL, EntityLimits::Bot::INULL, + EntityLimits::Bot::INULL, EntityLimits::Bot::INULL, EntityLimits::Bot::INULL, + EntityLimits::Bot::INULL + ), EntityLimits::Bot::invslot::POSSESSIONS_BITMASK, EntityLimits::Bot::INULL, @@ -555,33 +407,20 @@ static const EQEmu::inventory::LookupEntry inventory_lookup_entries[EQEmu::versi false, false, false - }, - { - EQEmu::invtype::POSSESSIONS_SIZE, /*InvTypePossessionsSize,*/ - EntityLimits::ClientPet::INULL, - EntityLimits::ClientPet::INULL, - EntityLimits::ClientPet::invtype::TRADE_SIZE, - EntityLimits::ClientPet::INULL, - EntityLimits::ClientPet::INULL, - EntityLimits::ClientPet::INULL, - EntityLimits::ClientPet::INULL, - EntityLimits::ClientPet::INULL, - EntityLimits::ClientPet::INULL, - EntityLimits::ClientPet::INULL, - EntityLimits::ClientPet::INULL, /*InvTypeCorpseSize,*/ - EntityLimits::ClientPet::INULL, - EntityLimits::ClientPet::INULL, - EntityLimits::ClientPet::INULL, - EntityLimits::ClientPet::INULL, - EntityLimits::ClientPet::INULL, - EntityLimits::ClientPet::INULL, - EntityLimits::ClientPet::INULL, - EntityLimits::ClientPet::INULL, - EntityLimits::ClientPet::INULL, - EntityLimits::ClientPet::INULL, - EntityLimits::ClientPet::INULL, - EntityLimits::ClientPet::INULL, - EntityLimits::ClientPet::INULL, + ), + /*[MobVersion::ClientPet] =*/ + EQEmu::inventory::LookupEntry( + EQEmu::inventory::LookupEntry::InventoryTypeSize_Struct( + EQEmu::invtype::POSSESSIONS_SIZE, /*InvTypePossessionsSize,*/ EntityLimits::ClientPet::INULL, EntityLimits::ClientPet::INULL, + EntityLimits::ClientPet::invtype::TRADE_SIZE, EntityLimits::ClientPet::INULL, EntityLimits::ClientPet::INULL, + EntityLimits::ClientPet::INULL, EntityLimits::ClientPet::INULL, EntityLimits::ClientPet::INULL, + EntityLimits::ClientPet::INULL, EntityLimits::ClientPet::INULL, EntityLimits::ClientPet::INULL, /*InvTypeCorpseSize,*/ + EntityLimits::ClientPet::INULL, EntityLimits::ClientPet::INULL, EntityLimits::ClientPet::INULL, + EntityLimits::ClientPet::INULL, EntityLimits::ClientPet::INULL, EntityLimits::ClientPet::INULL, + EntityLimits::ClientPet::INULL, EntityLimits::ClientPet::INULL, EntityLimits::ClientPet::INULL, + EntityLimits::ClientPet::INULL, EntityLimits::ClientPet::INULL, EntityLimits::ClientPet::INULL, + EntityLimits::ClientPet::INULL + ), EntityLimits::ClientPet::INULL, EntityLimits::ClientPet::INULL, @@ -592,33 +431,20 @@ static const EQEmu::inventory::LookupEntry inventory_lookup_entries[EQEmu::versi false, false, false - }, - { - EQEmu::invtype::POSSESSIONS_SIZE, /*InvTypePossessionsSize,*/ - EntityLimits::NPCPet::INULL, - EntityLimits::NPCPet::INULL, - EntityLimits::NPCPet::invtype::TRADE_SIZE, - EntityLimits::NPCPet::INULL, - EntityLimits::NPCPet::INULL, - EntityLimits::NPCPet::INULL, - EntityLimits::NPCPet::INULL, - EntityLimits::NPCPet::INULL, - EntityLimits::NPCPet::INULL, - EntityLimits::NPCPet::INULL, - EntityLimits::NPCPet::INULL, /*InvTypeCorpseSize,*/ - EntityLimits::NPCPet::INULL, - EntityLimits::NPCPet::INULL, - EntityLimits::NPCPet::INULL, - EntityLimits::NPCPet::INULL, - EntityLimits::NPCPet::INULL, - EntityLimits::NPCPet::INULL, - EntityLimits::NPCPet::INULL, - EntityLimits::NPCPet::INULL, - EntityLimits::NPCPet::INULL, - EntityLimits::NPCPet::INULL, - EntityLimits::NPCPet::INULL, - EntityLimits::NPCPet::INULL, - EntityLimits::NPCPet::INULL, + ), + /*[MobVersion::NPCPet] =*/ + EQEmu::inventory::LookupEntry( + EQEmu::inventory::LookupEntry::InventoryTypeSize_Struct( + EQEmu::invtype::POSSESSIONS_SIZE, /*InvTypePossessionsSize,*/ EntityLimits::NPCPet::INULL, EntityLimits::NPCPet::INULL, + EntityLimits::NPCPet::invtype::TRADE_SIZE, EntityLimits::NPCPet::INULL, EntityLimits::NPCPet::INULL, + EntityLimits::NPCPet::INULL, EntityLimits::NPCPet::INULL, EntityLimits::NPCPet::INULL, + EntityLimits::NPCPet::INULL, EntityLimits::NPCPet::INULL, EntityLimits::NPCPet::INULL, /*InvTypeCorpseSize,*/ + EntityLimits::NPCPet::INULL, EntityLimits::NPCPet::INULL, EntityLimits::NPCPet::INULL, + EntityLimits::NPCPet::INULL, EntityLimits::NPCPet::INULL, EntityLimits::NPCPet::INULL, + EntityLimits::NPCPet::INULL, EntityLimits::NPCPet::INULL, EntityLimits::NPCPet::INULL, + EntityLimits::NPCPet::INULL, EntityLimits::NPCPet::INULL, EntityLimits::NPCPet::INULL, + EntityLimits::NPCPet::INULL + ), EntityLimits::NPCPet::INULL, EntityLimits::NPCPet::INULL, @@ -629,33 +455,20 @@ static const EQEmu::inventory::LookupEntry inventory_lookup_entries[EQEmu::versi false, false, false - }, - { - EQEmu::invtype::POSSESSIONS_SIZE, /*InvTypePossessionsSize,*/ - EntityLimits::MercPet::INULL, - EntityLimits::MercPet::INULL, - EntityLimits::MercPet::invtype::TRADE_SIZE, - EntityLimits::MercPet::INULL, - EntityLimits::MercPet::INULL, - EntityLimits::MercPet::INULL, - EntityLimits::MercPet::INULL, - EntityLimits::MercPet::INULL, - EntityLimits::MercPet::INULL, - EntityLimits::MercPet::INULL, - EntityLimits::MercPet::INULL, /*InvTypeCorpseSize,*/ - EntityLimits::MercPet::INULL, - EntityLimits::MercPet::INULL, - EntityLimits::MercPet::INULL, - EntityLimits::MercPet::INULL, - EntityLimits::MercPet::INULL, - EntityLimits::MercPet::INULL, - EntityLimits::MercPet::INULL, - EntityLimits::MercPet::INULL, - EntityLimits::MercPet::INULL, - EntityLimits::MercPet::INULL, - EntityLimits::MercPet::INULL, - EntityLimits::MercPet::INULL, - EntityLimits::MercPet::INULL, + ), + /*[MobVersion::MercPet] =*/ + EQEmu::inventory::LookupEntry( + EQEmu::inventory::LookupEntry::InventoryTypeSize_Struct( + EQEmu::invtype::POSSESSIONS_SIZE, /*InvTypePossessionsSize,*/ EntityLimits::MercPet::INULL, EntityLimits::MercPet::INULL, + EntityLimits::MercPet::invtype::TRADE_SIZE, EntityLimits::MercPet::INULL, EntityLimits::MercPet::INULL, + EntityLimits::MercPet::INULL, EntityLimits::MercPet::INULL, EntityLimits::MercPet::INULL, + EntityLimits::MercPet::INULL, EntityLimits::MercPet::INULL, EntityLimits::MercPet::INULL, /*InvTypeCorpseSize,*/ + EntityLimits::MercPet::INULL, EntityLimits::MercPet::INULL, EntityLimits::MercPet::INULL, + EntityLimits::MercPet::INULL, EntityLimits::MercPet::INULL, EntityLimits::MercPet::INULL, + EntityLimits::MercPet::INULL, EntityLimits::MercPet::INULL, EntityLimits::MercPet::INULL, + EntityLimits::MercPet::INULL, EntityLimits::MercPet::INULL, EntityLimits::MercPet::INULL, + EntityLimits::MercPet::INULL + ), EntityLimits::MercPet::INULL, EntityLimits::MercPet::INULL, @@ -666,33 +479,20 @@ static const EQEmu::inventory::LookupEntry inventory_lookup_entries[EQEmu::versi false, false, false - }, - { - EQEmu::invtype::POSSESSIONS_SIZE, /*InvTypePossessionsSize,*/ - EntityLimits::BotPet::INULL, - EntityLimits::BotPet::INULL, - EntityLimits::BotPet::invtype::TRADE_SIZE, - EntityLimits::BotPet::INULL, - EntityLimits::BotPet::INULL, - EntityLimits::BotPet::INULL, - EntityLimits::BotPet::INULL, - EntityLimits::BotPet::INULL, - EntityLimits::BotPet::INULL, - EntityLimits::BotPet::INULL, - EntityLimits::BotPet::INULL, /*InvTypeCorpseSize,*/ - EntityLimits::BotPet::INULL, - EntityLimits::BotPet::INULL, - EntityLimits::BotPet::INULL, - EntityLimits::BotPet::INULL, - EntityLimits::BotPet::INULL, - EntityLimits::BotPet::INULL, - EntityLimits::BotPet::INULL, - EntityLimits::BotPet::INULL, - EntityLimits::BotPet::INULL, - EntityLimits::BotPet::INULL, - EntityLimits::BotPet::INULL, - EntityLimits::BotPet::INULL, - EntityLimits::BotPet::INULL, + ), + /*[MobVersion::BotPet] =*/ + EQEmu::inventory::LookupEntry( + EQEmu::inventory::LookupEntry::InventoryTypeSize_Struct( + EQEmu::invtype::POSSESSIONS_SIZE, /*InvTypePossessionsSize,*/ EntityLimits::BotPet::INULL, EntityLimits::BotPet::INULL, + EntityLimits::BotPet::invtype::TRADE_SIZE, EntityLimits::BotPet::INULL, EntityLimits::BotPet::INULL, + EntityLimits::BotPet::INULL, EntityLimits::BotPet::INULL, EntityLimits::BotPet::INULL, + EntityLimits::BotPet::INULL, EntityLimits::BotPet::INULL, EntityLimits::BotPet::INULL, /*InvTypeCorpseSize,*/ + EntityLimits::BotPet::INULL, EntityLimits::BotPet::INULL, EntityLimits::BotPet::INULL, + EntityLimits::BotPet::INULL, EntityLimits::BotPet::INULL, EntityLimits::BotPet::INULL, + EntityLimits::BotPet::INULL, EntityLimits::BotPet::INULL, EntityLimits::BotPet::INULL, + EntityLimits::BotPet::INULL, EntityLimits::BotPet::INULL, EntityLimits::BotPet::INULL, + EntityLimits::BotPet::INULL + ), EntityLimits::BotPet::INULL, EntityLimits::BotPet::INULL, @@ -703,33 +503,20 @@ static const EQEmu::inventory::LookupEntry inventory_lookup_entries[EQEmu::versi false, false, false - }, - { // OfflineTitanium - Titanium::INULL, - Titanium::INULL, - Titanium::INULL, - Titanium::invtype::TRADE_SIZE, - Titanium::INULL, - Titanium::INULL, - Titanium::INULL, - Titanium::INULL, - Titanium::INULL, - Titanium::invtype::MERCHANT_SIZE, - Titanium::INULL, - Titanium::INULL, - Titanium::invtype::BAZAAR_SIZE, - Titanium::invtype::INSPECT_SIZE, - Titanium::INULL, - Titanium::invtype::VIEW_MOD_PC_SIZE, - Titanium::invtype::VIEW_MOD_BANK_SIZE, - Titanium::invtype::VIEW_MOD_SHARED_BANK_SIZE, - Titanium::invtype::VIEW_MOD_LIMBO_SIZE, - Titanium::INULL, - Titanium::INULL, - Titanium::INULL, - Titanium::INULL, - Titanium::INULL, - Titanium::INULL, + ), + /*[MobVersion::OfflineTitanium] =*/ + EQEmu::inventory::LookupEntry( + EQEmu::inventory::LookupEntry::InventoryTypeSize_Struct( + Titanium::INULL, Titanium::INULL, Titanium::INULL, + Titanium::invtype::TRADE_SIZE, Titanium::INULL, Titanium::INULL, + Titanium::INULL, Titanium::INULL, Titanium::INULL, + Titanium::invtype::MERCHANT_SIZE, Titanium::INULL, Titanium::INULL, + Titanium::invtype::BAZAAR_SIZE, Titanium::invtype::INSPECT_SIZE, Titanium::INULL, + Titanium::invtype::VIEW_MOD_PC_SIZE, Titanium::invtype::VIEW_MOD_BANK_SIZE, Titanium::invtype::VIEW_MOD_SHARED_BANK_SIZE, + Titanium::invtype::VIEW_MOD_LIMBO_SIZE, Titanium::INULL, Titanium::INULL, + Titanium::INULL, Titanium::INULL, Titanium::INULL, + Titanium::INULL + ), Titanium::INULL, Titanium::INULL, @@ -740,33 +527,20 @@ static const EQEmu::inventory::LookupEntry inventory_lookup_entries[EQEmu::versi false, false, false - }, - { // OfflineSoF - SoF::INULL, - SoF::INULL, - SoF::INULL, - SoF::invtype::TRADE_SIZE, - SoF::INULL, - SoF::INULL, - SoF::INULL, - SoF::INULL, - SoF::INULL, - SoF::invtype::MERCHANT_SIZE, - SoF::INULL, - SoF::INULL, - SoF::invtype::BAZAAR_SIZE, - SoF::invtype::INSPECT_SIZE, - SoF::INULL, - SoF::invtype::VIEW_MOD_PC_SIZE, - SoF::invtype::VIEW_MOD_BANK_SIZE, - SoF::invtype::VIEW_MOD_SHARED_BANK_SIZE, - SoF::invtype::VIEW_MOD_LIMBO_SIZE, - SoF::INULL, - SoF::INULL, - SoF::INULL, - SoF::INULL, - SoF::INULL, - SoF::INULL, + ), + /*[MobVersion::OfflineSoF] =*/ + EQEmu::inventory::LookupEntry( + EQEmu::inventory::LookupEntry::InventoryTypeSize_Struct( + SoF::INULL, SoF::INULL, SoF::INULL, + SoF::invtype::TRADE_SIZE, SoF::INULL, SoF::INULL, + SoF::INULL, SoF::INULL, SoF::INULL, + SoF::invtype::MERCHANT_SIZE, SoF::INULL, SoF::INULL, + SoF::invtype::BAZAAR_SIZE, SoF::invtype::INSPECT_SIZE, SoF::INULL, + SoF::invtype::VIEW_MOD_PC_SIZE, SoF::invtype::VIEW_MOD_BANK_SIZE, SoF::invtype::VIEW_MOD_SHARED_BANK_SIZE, + SoF::invtype::VIEW_MOD_LIMBO_SIZE, SoF::INULL, SoF::INULL, + SoF::INULL, SoF::INULL, SoF::INULL, + SoF::INULL + ), SoF::INULL, SoF::INULL, @@ -777,33 +551,20 @@ static const EQEmu::inventory::LookupEntry inventory_lookup_entries[EQEmu::versi false, false, false - }, - { // OfflineSoD - SoD::INULL, - SoD::INULL, - SoD::INULL, - SoD::invtype::TRADE_SIZE, - SoD::INULL, - SoD::INULL, - SoD::INULL, - SoD::INULL, - SoD::INULL, - SoD::invtype::MERCHANT_SIZE, - SoD::INULL, - SoD::INULL, - SoD::invtype::BAZAAR_SIZE, - SoD::invtype::INSPECT_SIZE, - SoD::INULL, - SoD::invtype::VIEW_MOD_PC_SIZE, - SoD::invtype::VIEW_MOD_BANK_SIZE, - SoD::invtype::VIEW_MOD_SHARED_BANK_SIZE, - SoD::invtype::VIEW_MOD_LIMBO_SIZE, - SoD::INULL, - SoD::INULL, - SoD::INULL, - SoD::INULL, - SoD::INULL, - SoD::INULL, + ), + /*[MobVersion::OfflineSoD] =*/ + EQEmu::inventory::LookupEntry( + EQEmu::inventory::LookupEntry::InventoryTypeSize_Struct( + SoD::INULL, SoD::INULL, SoD::INULL, + SoD::invtype::TRADE_SIZE, SoD::INULL, SoD::INULL, + SoD::INULL, SoD::INULL, SoD::INULL, + SoD::invtype::MERCHANT_SIZE, SoD::INULL, SoD::INULL, + SoD::invtype::BAZAAR_SIZE, SoD::invtype::INSPECT_SIZE, SoD::INULL, + SoD::invtype::VIEW_MOD_PC_SIZE, SoD::invtype::VIEW_MOD_BANK_SIZE, SoD::invtype::VIEW_MOD_SHARED_BANK_SIZE, + SoD::invtype::VIEW_MOD_LIMBO_SIZE, SoD::INULL, SoD::INULL, + SoD::INULL, SoD::INULL, SoD::INULL, + SoD::INULL + ), SoD::INULL, SoD::INULL, @@ -814,33 +575,20 @@ static const EQEmu::inventory::LookupEntry inventory_lookup_entries[EQEmu::versi false, false, false - }, - { // OfflineUF - UF::INULL, - UF::INULL, - UF::INULL, - UF::invtype::TRADE_SIZE, - UF::INULL, - UF::INULL, - UF::INULL, - UF::INULL, - UF::INULL, - UF::invtype::MERCHANT_SIZE, - UF::INULL, - UF::INULL, - UF::invtype::BAZAAR_SIZE, - UF::invtype::INSPECT_SIZE, - UF::INULL, - UF::invtype::VIEW_MOD_PC_SIZE, - UF::invtype::VIEW_MOD_BANK_SIZE, - UF::invtype::VIEW_MOD_SHARED_BANK_SIZE, - UF::invtype::VIEW_MOD_LIMBO_SIZE, - UF::INULL, - UF::INULL, - UF::INULL, - UF::INULL, - UF::INULL, - UF::INULL, + ), + /*[MobVersion::OfflineUF] =*/ + EQEmu::inventory::LookupEntry( + EQEmu::inventory::LookupEntry::InventoryTypeSize_Struct( + UF::INULL, UF::INULL, UF::INULL, + UF::invtype::TRADE_SIZE, UF::INULL, UF::INULL, + UF::INULL, UF::INULL, UF::INULL, + UF::invtype::MERCHANT_SIZE, UF::INULL, UF::INULL, + UF::invtype::BAZAAR_SIZE, UF::invtype::INSPECT_SIZE, UF::INULL, + UF::invtype::VIEW_MOD_PC_SIZE, UF::invtype::VIEW_MOD_BANK_SIZE, UF::invtype::VIEW_MOD_SHARED_BANK_SIZE, + UF::invtype::VIEW_MOD_LIMBO_SIZE, UF::INULL, UF::INULL, + UF::INULL, UF::INULL, UF::INULL, + UF::INULL + ), UF::INULL, UF::INULL, @@ -851,33 +599,20 @@ static const EQEmu::inventory::LookupEntry inventory_lookup_entries[EQEmu::versi false, false, false - }, - { // OfflineRoF - RoF::INULL, - RoF::INULL, - RoF::INULL, - RoF::invtype::TRADE_SIZE, - RoF::INULL, - RoF::INULL, - RoF::INULL, - RoF::INULL, - RoF::INULL, - RoF::invtype::MERCHANT_SIZE, - RoF::INULL, - RoF::INULL, - RoF::invtype::BAZAAR_SIZE, - RoF::invtype::INSPECT_SIZE, - RoF::INULL, - RoF::invtype::VIEW_MOD_PC_SIZE, - RoF::invtype::VIEW_MOD_BANK_SIZE, - RoF::invtype::VIEW_MOD_SHARED_BANK_SIZE, - RoF::invtype::VIEW_MOD_LIMBO_SIZE, - RoF::INULL, - RoF::INULL, - RoF::INULL, - RoF::INULL, - RoF::INULL, - RoF::INULL, + ), + /*[MobVersion::OfflineRoF] =*/ + EQEmu::inventory::LookupEntry( + EQEmu::inventory::LookupEntry::InventoryTypeSize_Struct( + RoF::INULL, RoF::INULL, RoF::INULL, + RoF::invtype::TRADE_SIZE, RoF::INULL, RoF::INULL, + RoF::INULL, RoF::INULL, RoF::INULL, + RoF::invtype::MERCHANT_SIZE, RoF::INULL, RoF::INULL, + RoF::invtype::BAZAAR_SIZE, RoF::invtype::INSPECT_SIZE, RoF::INULL, + RoF::invtype::VIEW_MOD_PC_SIZE, RoF::invtype::VIEW_MOD_BANK_SIZE, RoF::invtype::VIEW_MOD_SHARED_BANK_SIZE, + RoF::invtype::VIEW_MOD_LIMBO_SIZE, RoF::INULL, RoF::INULL, + RoF::INULL, RoF::INULL, RoF::INULL, + RoF::INULL + ), RoF::INULL, RoF::INULL, @@ -888,33 +623,20 @@ static const EQEmu::inventory::LookupEntry inventory_lookup_entries[EQEmu::versi false, false, false - }, - { // OfflineRoF2 - RoF2::INULL, - RoF2::INULL, - RoF2::INULL, - RoF2::invtype::TRADE_SIZE, - RoF2::INULL, - RoF2::INULL, - RoF2::INULL, - RoF2::INULL, - RoF2::INULL, - RoF2::invtype::MERCHANT_SIZE, - RoF2::INULL, - RoF2::INULL, - RoF2::invtype::BAZAAR_SIZE, - RoF2::invtype::INSPECT_SIZE, - RoF2::INULL, - RoF2::invtype::VIEW_MOD_PC_SIZE, - RoF2::invtype::VIEW_MOD_BANK_SIZE, - RoF2::invtype::VIEW_MOD_SHARED_BANK_SIZE, - RoF2::invtype::VIEW_MOD_LIMBO_SIZE, - RoF2::INULL, - RoF2::INULL, - RoF2::INULL, - RoF2::INULL, - RoF2::INULL, - RoF2::INULL, + ), + /*[MobVersion::OfflineRoF2] =*/ + EQEmu::inventory::LookupEntry( + EQEmu::inventory::LookupEntry::InventoryTypeSize_Struct( + RoF2::INULL, RoF2::INULL, RoF2::INULL, + RoF2::invtype::TRADE_SIZE, RoF2::INULL, RoF2::INULL, + RoF2::INULL, RoF2::INULL, RoF2::INULL, + RoF2::invtype::MERCHANT_SIZE, RoF2::INULL, RoF2::INULL, + RoF2::invtype::BAZAAR_SIZE, RoF2::invtype::INSPECT_SIZE, RoF2::INULL, + RoF2::invtype::VIEW_MOD_PC_SIZE, RoF2::invtype::VIEW_MOD_BANK_SIZE, RoF2::invtype::VIEW_MOD_SHARED_BANK_SIZE, + RoF2::invtype::VIEW_MOD_LIMBO_SIZE, RoF2::INULL, RoF2::INULL, + RoF2::INULL, RoF2::INULL, RoF2::INULL, + RoF2::INULL + ), RoF2::INULL, RoF2::INULL, @@ -925,7 +647,7 @@ static const EQEmu::inventory::LookupEntry inventory_lookup_entries[EQEmu::versi false, false, false - } + ) }; const EQEmu::inventory::LookupEntry* EQEmu::inventory::Lookup(versions::MobVersion mob_version) @@ -935,70 +657,92 @@ const EQEmu::inventory::LookupEntry* EQEmu::inventory::Lookup(versions::MobVersi static const EQEmu::behavior::LookupEntry behavior_lookup_entries[EQEmu::versions::MobVersionCount] = { - { // Unknown + /*[MobVersion::Unknown] =*/ + EQEmu::behavior::LookupEntry() = { true }, - { // Client62 + /*[MobVersion::Client62] =*/ + EQEmu::behavior::LookupEntry() = { true }, - { // Titanium + /*[MobVersion::Titanium] =*/ + EQEmu::behavior::LookupEntry() = { Titanium::behavior::CoinHasWeight }, - { // SoF + /*[MobVersion::SoF] =*/ + EQEmu::behavior::LookupEntry() = { SoF::behavior::CoinHasWeight }, - { // SoD + /*[MobVersion::SoD] =*/ + EQEmu::behavior::LookupEntry() = { SoD::behavior::CoinHasWeight }, - { // UF + /*[MobVersion::UF] =*/ + EQEmu::behavior::LookupEntry() = { UF::behavior::CoinHasWeight }, - { // RoF + /*[MobVersion::RoF] =*/ + EQEmu::behavior::LookupEntry() = { RoF::behavior::CoinHasWeight }, - { // RoF2 + /*[MobVersion::RoF2] =*/ + EQEmu::behavior::LookupEntry() = { RoF2::behavior::CoinHasWeight }, - { // NPC + /*[MobVersion::NPC] =*/ + EQEmu::behavior::LookupEntry() = { EQEmu::behavior::CoinHasWeight }, - { // NPCMerchant + /*[MobVersion::NPCMerchant] =*/ + EQEmu::behavior::LookupEntry() = { EQEmu::behavior::CoinHasWeight }, - { // Merc + /*[MobVersion::Merc] =*/ + EQEmu::behavior::LookupEntry() = { EQEmu::behavior::CoinHasWeight }, - { // Bot + /*[MobVersion::Bot] =*/ + EQEmu::behavior::LookupEntry() = { EQEmu::behavior::CoinHasWeight }, - { // ClientPet + /*[MobVersion::ClientPet] =*/ + EQEmu::behavior::LookupEntry() = { EQEmu::behavior::CoinHasWeight }, - { // NPCPet + /*[MobVersion::NPCPet] =*/ + EQEmu::behavior::LookupEntry() = { EQEmu::behavior::CoinHasWeight }, - { // MercPet + /*[MobVersion::MercPet] =*/ + EQEmu::behavior::LookupEntry() = { EQEmu::behavior::CoinHasWeight }, - { // BotPet + /*[MobVersion::BotPet] =*/ + EQEmu::behavior::LookupEntry() = { EQEmu::behavior::CoinHasWeight }, - { // OfflineTitanium + /*[MobVersion::OfflineTitanium] =*/ + EQEmu::behavior::LookupEntry() = { Titanium::behavior::CoinHasWeight }, - { // OfflineSoF + /*[MobVersion::OfflineSoF] =*/ + EQEmu::behavior::LookupEntry() = { SoF::behavior::CoinHasWeight }, - { // OfflineSoD + /*[MobVersion::OfflineSoD] =*/ + EQEmu::behavior::LookupEntry() = { SoD::behavior::CoinHasWeight }, - { // OfflineUF + /*[MobVersion::OfflineUF] =*/ + EQEmu::behavior::LookupEntry() = { UF::behavior::CoinHasWeight }, - { // OfflineRoF + /*[MobVersion::OfflineRoF] =*/ + EQEmu::behavior::LookupEntry() = { RoF::behavior::CoinHasWeight }, - { // OfflineRoF2 + /*[MobVersion::OfflineRoF2] =*/ + EQEmu::behavior::LookupEntry() = { RoF2::behavior::CoinHasWeight } }; diff --git a/common/eq_limits.h b/common/eq_limits.h index c26c7697e..8bb620d0e 100644 --- a/common/eq_limits.h +++ b/common/eq_limits.h @@ -34,8 +34,7 @@ namespace EQEmu { namespace constants { - class LookupEntry { - public: + struct LookupEntry { int16 CharacterCreationLimit; int LongBuffs; int ShortBuffs; @@ -51,14 +50,50 @@ namespace EQEmu } /*constants*/ namespace inventory { - class LookupEntry { - public: + struct LookupEntry { // note: 'PossessionsBitmask' needs to be attuned to the client version with the highest number // of possessions slots and 'InventoryTypeSize[typePossessions]' should reflect the same count // with translators adjusting for valid slot indices. Server-side validations will be performed // against 'PossessionsBitmask' (note: the same applies to Corpse type size and bitmask) - int16 InventoryTypeSize[25]; // should reflect EQEmu::invtype::TYPE_COUNT referenced in emu_constants.h + struct InventoryTypeSize_Struct { // should reflect count and naming conventions referenced in emu_constants.h + int16 Possessions, Bank, SharedBank; + int16 Trade, World, Limbo; + int16 Tribute, TrophyTribute, GuildTribute; + int16 Merchant, Deleted, Corpse; + int16 Bazaar, Inspect, RealEstate; + int16 ViewMODPC, ViewMODBank, ViewMODSharedBank; + int16 ViewMODLimbo, AltStorage, Archived; + int16 Mail, GuildTrophyTribute, Krono; + int16 Other; + + InventoryTypeSize_Struct( + int16 Possessions, int16 Bank, int16 SharedBank, + int16 Trade, int16 World, int16 Limbo, + int16 Tribute, int16 TrophyTribute, int16 GuildTribute, + int16 Merchant, int16 Deleted, int16 Corpse, + int16 Bazaar, int16 Inspect, int16 RealEstate, + int16 ViewMODPC, int16 ViewMODBank, int16 ViewMODSharedBank, + int16 ViewMODLimbo, int16 AltStorage, int16 Archived, + int16 Mail, int16 GuildTrophyTribute, int16 Krono, + int16 Other + ) : + Possessions(Possessions), Bank(Bank), SharedBank(SharedBank), + Trade(Trade), World(World), Limbo(Limbo), + Tribute(Tribute), TrophyTribute(TrophyTribute), GuildTribute(GuildTribute), + Merchant(Merchant), Deleted(Deleted), Corpse(Corpse), + Bazaar(Bazaar), Inspect(Inspect), RealEstate(RealEstate), + ViewMODPC(ViewMODPC), ViewMODBank(ViewMODBank), ViewMODSharedBank(ViewMODSharedBank), + ViewMODLimbo(ViewMODLimbo), AltStorage(AltStorage), Archived(Archived), + Mail(Mail), GuildTrophyTribute(GuildTrophyTribute), Krono(Krono), + Other(Other) + { } + }; + + union { + InventoryTypeSize_Struct InventoryTypeSize; + int16 InventoryTypeSizeArray[25]; // should reflect EQEmu::invtype::TYPE_COUNT referenced in emu_constants.h + }; uint64 PossessionsBitmask; uint64 CorpseBitmask; @@ -69,6 +104,28 @@ namespace EQEmu bool AllowClickCastFromBag; bool ConcatenateInvTypeLimbo; bool AllowOverLevelEquipment; + + LookupEntry( + InventoryTypeSize_Struct InventoryTypeSize, + uint64 PossessionsBitmask, + uint64 CorpseBitmask, + int16 BagSlotCount, + int16 AugSocketCount, + bool AllowEmptyBagInBag, + bool AllowClickCastFromBag, + bool ConcatenateInvTypeLimbo, + bool AllowOverLevelEquipment + ) : + InventoryTypeSize(InventoryTypeSize), + PossessionsBitmask(PossessionsBitmask), + CorpseBitmask(CorpseBitmask), + BagSlotCount(BagSlotCount), + AugSocketCount(AugSocketCount), + AllowEmptyBagInBag(AllowEmptyBagInBag), + AllowClickCastFromBag(AllowClickCastFromBag), + ConcatenateInvTypeLimbo(ConcatenateInvTypeLimbo), + AllowOverLevelEquipment(AllowOverLevelEquipment) + { } }; const LookupEntry* Lookup(versions::MobVersion mob_version); @@ -76,8 +133,7 @@ namespace EQEmu } /*inventory*/ namespace behavior { - class LookupEntry { - public: + struct LookupEntry { bool CoinHasWeight; }; diff --git a/common/inventory_profile.cpp b/common/inventory_profile.cpp index 47068a492..f353aa673 100644 --- a/common/inventory_profile.cpp +++ b/common/inventory_profile.cpp @@ -241,12 +241,12 @@ int16 EQEmu::InventoryProfile::PutItem(int16 slot_id, const ItemInstance& inst) return EQEmu::invslot::SLOT_INVALID; } else if (slot_id <= EQEmu::invslot::BANK_END && slot_id >= EQEmu::invslot::BANK_BEGIN) { - if ((slot_id - EQEmu::invslot::BANK_BEGIN) >= m_lookup->InventoryTypeSize[EQEmu::invtype::typeBank]) + if ((slot_id - EQEmu::invslot::BANK_BEGIN) >= m_lookup->InventoryTypeSize.Bank) return EQEmu::invslot::SLOT_INVALID; } else if (slot_id <= EQEmu::invbag::BANK_BAGS_END && slot_id >= EQEmu::invbag::BANK_BAGS_BEGIN) { auto temp_slot = (slot_id - EQEmu::invbag::BANK_BAGS_BEGIN) / EQEmu::invbag::SLOT_COUNT; - if (temp_slot >= m_lookup->InventoryTypeSize[EQEmu::invtype::typeBank]) + if (temp_slot >= m_lookup->InventoryTypeSize.Bank) return EQEmu::invslot::SLOT_INVALID; } @@ -298,14 +298,14 @@ bool EQEmu::InventoryProfile::SwapItem( } } else if (source_slot <= EQEmu::invslot::BANK_END && source_slot >= EQEmu::invslot::BANK_BEGIN) { - if ((source_slot - EQEmu::invslot::BANK_BEGIN) >= m_lookup->InventoryTypeSize[EQEmu::invtype::typeBank]) { + if ((source_slot - EQEmu::invslot::BANK_BEGIN) >= m_lookup->InventoryTypeSize.Bank) { fail_state = swapNotAllowed; return false; } } else if (source_slot <= EQEmu::invbag::BANK_BAGS_END && source_slot >= EQEmu::invbag::BANK_BAGS_BEGIN) { auto temp_slot = (source_slot - EQEmu::invbag::BANK_BAGS_BEGIN) / EQEmu::invbag::SLOT_COUNT; - if (temp_slot >= m_lookup->InventoryTypeSize[EQEmu::invtype::typeBank]) { + if (temp_slot >= m_lookup->InventoryTypeSize.Bank) { fail_state = swapNotAllowed; return false; } @@ -325,14 +325,14 @@ bool EQEmu::InventoryProfile::SwapItem( } } else if (destination_slot <= EQEmu::invslot::BANK_END && destination_slot >= EQEmu::invslot::BANK_BEGIN) { - if ((destination_slot - EQEmu::invslot::BANK_BEGIN) >= m_lookup->InventoryTypeSize[EQEmu::invtype::typeBank]) { + if ((destination_slot - EQEmu::invslot::BANK_BEGIN) >= m_lookup->InventoryTypeSize.Bank) { fail_state = swapNotAllowed; return false; } } else if (destination_slot <= EQEmu::invbag::BANK_BAGS_END && destination_slot >= EQEmu::invbag::BANK_BAGS_BEGIN) { auto temp_slot = (destination_slot - EQEmu::invbag::BANK_BAGS_BEGIN) / EQEmu::invbag::SLOT_COUNT; - if (temp_slot >= m_lookup->InventoryTypeSize[EQEmu::invtype::typeBank]) { + if (temp_slot >= m_lookup->InventoryTypeSize.Bank) { fail_state = swapNotAllowed; return false; } @@ -1308,7 +1308,7 @@ EQEmu::ItemInstance* EQEmu::InventoryProfile::_GetItem(const std::map= EQEmu::invslot::BANK_BEGIN) { - if (slot_id - EQEmu::invslot::BANK_BEGIN >= m_lookup->InventoryTypeSize[EQEmu::invtype::typeBank]) + if (slot_id - EQEmu::invslot::BANK_BEGIN >= m_lookup->InventoryTypeSize.Bank) return nullptr; } @@ -1360,7 +1360,7 @@ int16 EQEmu::InventoryProfile::_PutItem(int16 slot_id, ItemInstance* inst) result = slot_id; } else if (slot_id >= invslot::BANK_BEGIN && slot_id <= invslot::BANK_END) { - if (slot_id - EQEmu::invslot::BANK_BEGIN < m_lookup->InventoryTypeSize[EQEmu::invtype::typeBank]) { + if (slot_id - EQEmu::invslot::BANK_BEGIN < m_lookup->InventoryTypeSize.Bank) { m_bank[slot_id] = inst; result = slot_id; } @@ -1403,7 +1403,7 @@ int16 EQEmu::InventoryProfile::_HasItem(std::map& bucket, continue; } else if (iter->first <= EQEmu::invslot::BANK_END && iter->first >= EQEmu::invslot::BANK_BEGIN) { - if (iter->first - EQEmu::invslot::BANK_BEGIN >= m_lookup->InventoryTypeSize[EQEmu::invtype::typeBank]) + if (iter->first - EQEmu::invslot::BANK_BEGIN >= m_lookup->InventoryTypeSize.Bank) continue; } @@ -1505,7 +1505,7 @@ int16 EQEmu::InventoryProfile::_HasItemByUse(std::map& buc continue; } else if (iter->first <= EQEmu::invslot::BANK_END && iter->first >= EQEmu::invslot::BANK_BEGIN) { - if (iter->first - EQEmu::invslot::BANK_BEGIN >= m_lookup->InventoryTypeSize[EQEmu::invtype::typeBank]) + if (iter->first - EQEmu::invslot::BANK_BEGIN >= m_lookup->InventoryTypeSize.Bank) continue; } @@ -1578,7 +1578,7 @@ int16 EQEmu::InventoryProfile::_HasItemByLoreGroup(std::mapfirst <= EQEmu::invslot::BANK_END && iter->first >= EQEmu::invslot::BANK_BEGIN) { - if (iter->first - EQEmu::invslot::BANK_BEGIN >= m_lookup->InventoryTypeSize[EQEmu::invtype::typeBank]) + if (iter->first - EQEmu::invslot::BANK_BEGIN >= m_lookup->InventoryTypeSize.Bank) continue; } diff --git a/common/shareddb.cpp b/common/shareddb.cpp index c4dd86f32..97a071448 100644 --- a/common/shareddb.cpp +++ b/common/shareddb.cpp @@ -571,7 +571,7 @@ bool SharedDatabase::GetInventory(uint32 char_id, EQEmu::InventoryProfile *inv) auto cv_conflict = false; auto pmask = inv->GetLookup()->PossessionsBitmask; - auto bank_size = inv->GetLookup()->InventoryTypeSize[EQEmu::invtype::typeBank]; + auto bank_size = inv->GetLookup()->InventoryTypeSize.Bank; for (auto row = results.begin(); row != results.end(); ++row) { int16 slot_id = atoi(row[0]); diff --git a/zone/corpse.cpp b/zone/corpse.cpp index dd362fedb..681f6d17a 100644 --- a/zone/corpse.cpp +++ b/zone/corpse.cpp @@ -1374,7 +1374,7 @@ void Corpse::QueryLoot(Client* to) { cur = itemlist.begin(); end = itemlist.end(); - int corpselootlimit = EQEmu::inventory::Lookup(EQEmu::versions::ConvertClientVersionToMobVersion(to->ClientVersion()))->InventoryTypeSize[EQEmu::invtype::typeCorpse]; + int corpselootlimit = EQEmu::inventory::Lookup(EQEmu::versions::ConvertClientVersionToMobVersion(to->ClientVersion()))->InventoryTypeSize.Corpse; for(; cur != end; ++cur) { ServerLootItem_Struct* sitem = *cur; diff --git a/zone/inventory.cpp b/zone/inventory.cpp index 3ceefc33b..9c802b5a3 100644 --- a/zone/inventory.cpp +++ b/zone/inventory.cpp @@ -113,7 +113,7 @@ uint32 Client::NukeItem(uint32 itemnum, uint8 where_to_check) { x++; } - DeleteItemInInventory(i, 0, ((i - EQEmu::invslot::BANK_BEGIN) >= GetInv().GetLookup()->InventoryTypeSize[EQEmu::invtype::typeBank])); + DeleteItemInInventory(i, 0, ((i - EQEmu::invslot::BANK_BEGIN) >= GetInv().GetLookup()->InventoryTypeSize.Bank)); } } @@ -126,7 +126,7 @@ uint32 Client::NukeItem(uint32 itemnum, uint8 where_to_check) { x++; } - DeleteItemInInventory(i, 0, (((i - EQEmu::invbag::BANK_BAGS_BEGIN) / EQEmu::invbag::SLOT_COUNT) >= GetInv().GetLookup()->InventoryTypeSize[EQEmu::invtype::typeBank])); + DeleteItemInInventory(i, 0, (((i - EQEmu::invbag::BANK_BAGS_BEGIN) / EQEmu::invbag::SLOT_COUNT) >= GetInv().GetLookup()->InventoryTypeSize.Bank)); } } } @@ -781,12 +781,12 @@ int32 Client::GetItemIDAt(int16 slot_id) { return INVALID_ID; } else if (slot_id <= EQEmu::invslot::BANK_END && slot_id >= EQEmu::invslot::BANK_BEGIN) { - if ((slot_id - EQEmu::invslot::BANK_BEGIN) >= GetInv().GetLookup()->InventoryTypeSize[EQEmu::invtype::typeBank]) + if ((slot_id - EQEmu::invslot::BANK_BEGIN) >= GetInv().GetLookup()->InventoryTypeSize.Bank) return INVALID_ID; } else if (slot_id <= EQEmu::invbag::BANK_BAGS_END && slot_id >= EQEmu::invbag::BANK_BAGS_BEGIN) { auto temp_slot = (slot_id - EQEmu::invbag::BANK_BAGS_BEGIN) / EQEmu::invbag::SLOT_COUNT; - if (temp_slot >= GetInv().GetLookup()->InventoryTypeSize[EQEmu::invtype::typeBank]) + if (temp_slot >= GetInv().GetLookup()->InventoryTypeSize.Bank) return INVALID_ID; } @@ -811,12 +811,12 @@ int32 Client::GetAugmentIDAt(int16 slot_id, uint8 augslot) { return INVALID_ID; } else if (slot_id <= EQEmu::invslot::BANK_END && slot_id >= EQEmu::invslot::BANK_BEGIN) { - if ((slot_id - EQEmu::invslot::BANK_BEGIN) >= GetInv().GetLookup()->InventoryTypeSize[EQEmu::invtype::typeBank]) + if ((slot_id - EQEmu::invslot::BANK_BEGIN) >= GetInv().GetLookup()->InventoryTypeSize.Bank) return INVALID_ID; } else if (slot_id <= EQEmu::invbag::BANK_BAGS_END && slot_id >= EQEmu::invbag::BANK_BAGS_BEGIN) { auto temp_slot = (slot_id - EQEmu::invbag::BANK_BAGS_BEGIN) / EQEmu::invbag::SLOT_COUNT; - if (temp_slot >= GetInv().GetLookup()->InventoryTypeSize[EQEmu::invtype::typeBank]) + if (temp_slot >= GetInv().GetLookup()->InventoryTypeSize.Bank) return INVALID_ID; } @@ -1474,11 +1474,11 @@ bool Client::IsValidSlot(uint32 slot) { return ((((uint64)1 << temp_slot) & GetInv().GetLookup()->PossessionsBitmask) != 0); } else if (slot <= EQEmu::invslot::BANK_END && slot >= EQEmu::invslot::BANK_BEGIN) { - return ((slot - EQEmu::invslot::BANK_BEGIN) < GetInv().GetLookup()->InventoryTypeSize[EQEmu::invtype::typeBank]); + return ((slot - EQEmu::invslot::BANK_BEGIN) < GetInv().GetLookup()->InventoryTypeSize.Bank); } else if (slot <= EQEmu::invbag::BANK_BAGS_END && slot >= EQEmu::invbag::BANK_BAGS_BEGIN) { auto temp_slot = (slot - EQEmu::invbag::BANK_BAGS_BEGIN) / EQEmu::invbag::SLOT_COUNT; - return (temp_slot < GetInv().GetLookup()->InventoryTypeSize[EQEmu::invtype::typeBank]); + return (temp_slot < GetInv().GetLookup()->InventoryTypeSize.Bank); } else if ( (slot == (uint32)INVALID_INDEX) || @@ -2500,7 +2500,7 @@ void Client::DisenchantSummonedBags(bool client_update) } for (auto slot_id = EQEmu::invslot::BANK_BEGIN; slot_id <= EQEmu::invslot::BANK_END; ++slot_id) { - if ((slot_id - EQEmu::invslot::BANK_BEGIN) >= GetInv().GetLookup()->InventoryTypeSize[EQEmu::invtype::typeBank]) + if ((slot_id - EQEmu::invslot::BANK_BEGIN) >= GetInv().GetLookup()->InventoryTypeSize.Bank) continue; auto inst = m_inv[slot_id]; @@ -2627,7 +2627,7 @@ void Client::RemoveNoRent(bool client_update) } for (auto slot_id = EQEmu::invslot::BANK_BEGIN; slot_id <= EQEmu::invslot::BANK_END; ++slot_id) { - if ((slot_id - EQEmu::invslot::BANK_BEGIN) >= GetInv().GetLookup()->InventoryTypeSize[EQEmu::invtype::typeBank]) + if ((slot_id - EQEmu::invslot::BANK_BEGIN) >= GetInv().GetLookup()->InventoryTypeSize.Bank) continue; auto inst = m_inv[slot_id]; @@ -2639,7 +2639,7 @@ void Client::RemoveNoRent(bool client_update) for (auto slot_id = EQEmu::invbag::BANK_BAGS_BEGIN; slot_id <= EQEmu::invbag::BANK_BAGS_END; ++slot_id) { auto temp_slot = (slot_id - EQEmu::invbag::BANK_BAGS_BEGIN) / EQEmu::invbag::SLOT_COUNT; - if (temp_slot >= GetInv().GetLookup()->InventoryTypeSize[EQEmu::invtype::typeBank]) + if (temp_slot >= GetInv().GetLookup()->InventoryTypeSize.Bank) continue; auto inst = m_inv[slot_id]; @@ -2745,7 +2745,7 @@ void Client::RemoveDuplicateLore(bool client_update) } for (auto slot_id = EQEmu::invslot::BANK_BEGIN; slot_id <= EQEmu::invslot::BANK_END; ++slot_id) { - if ((slot_id - EQEmu::invslot::BANK_BEGIN) >= GetInv().GetLookup()->InventoryTypeSize[EQEmu::invtype::typeBank]) + if ((slot_id - EQEmu::invslot::BANK_BEGIN) >= GetInv().GetLookup()->InventoryTypeSize.Bank) continue; auto inst = m_inv.PopItem(slot_id); @@ -2762,7 +2762,7 @@ void Client::RemoveDuplicateLore(bool client_update) for (auto slot_id = EQEmu::invbag::BANK_BAGS_BEGIN; slot_id <= EQEmu::invbag::BANK_BAGS_END; ++slot_id) { auto temp_slot = (slot_id - EQEmu::invbag::BANK_BAGS_BEGIN) / EQEmu::invbag::SLOT_COUNT; - if (temp_slot >= GetInv().GetLookup()->InventoryTypeSize[EQEmu::invtype::typeBank]) + if (temp_slot >= GetInv().GetLookup()->InventoryTypeSize.Bank) continue; auto inst = m_inv.PopItem(slot_id); @@ -2925,12 +2925,12 @@ void Client::SendItemPacket(int16 slot_id, const EQEmu::ItemInstance* inst, Item return; } else if (slot_id <= EQEmu::invslot::BANK_END && slot_id >= EQEmu::invslot::BANK_BEGIN) { - if ((slot_id - EQEmu::invslot::BANK_BEGIN) >= GetInv().GetLookup()->InventoryTypeSize[EQEmu::invtype::typeBank]) + if ((slot_id - EQEmu::invslot::BANK_BEGIN) >= GetInv().GetLookup()->InventoryTypeSize.Bank) return; } else if (slot_id <= EQEmu::invbag::BANK_BAGS_END && slot_id >= EQEmu::invbag::BANK_BAGS_BEGIN) { auto temp_slot = (slot_id - EQEmu::invbag::BANK_BAGS_BEGIN) / EQEmu::invbag::SLOT_COUNT; - if (temp_slot >= GetInv().GetLookup()->InventoryTypeSize[EQEmu::invtype::typeBank]) + if (temp_slot >= GetInv().GetLookup()->InventoryTypeSize.Bank) return; }