pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-05-16 18:52:22 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Cosmetic fix to match existing naming conventions

Browse Source
This commit is contained in:
Uleat
2016-06-02 20:19:40 -04:00
parent 542dc16752
commit e843f66135
2 changed files with 128 additions and 128 deletions
Download Patch File Download Diff File Expand all files Collapse all files
common/emu_limits.h
+8 -8
View File
@@ -27,41 +27,41 @@
namespace EntityLimits
{
namespace npc {
namespace NPC {
enum : int { Invalid = -1, Null, Safety };
enum : bool { False = false, True = true };
const size_t InvTypeTradeSize = 4;
} /*npc*/
} /*NPC*/
namespace merc {
namespace Merc {
enum : int { Invalid = -1, Null, Safety };
enum : bool { False = false, True = true };
const size_t InvTypeTradeSize = 4;
} /*merc*/
} /*Merc*/
namespace bot {
namespace Bot {
enum : int { Invalid = -1, Null, Safety };
enum : bool { False = false, True = true };
const size_t InvTypeTradeSize = 8;
} /*bot*/
} /*Bot*/
namespace pet {
namespace Pet {
enum : int { Invalid = -1, Null, Safety };
enum : bool { False = false, True = true };
const size_t InvTypeTradeSize = 4;
} /*pet*/
} /*Pet*/
}; /*EntityLimits*/
common/eq_limits.cpp
+120 -120
View File
@@ -69,10 +69,10 @@ size_t EQEmu::inventory::GetInventoryTypeSize(versions::InventoryVersion invento
UF::invtype::InvTypeBankSize,
RoF::invtype::InvTypeBankSize,
RoF2::invtype::InvTypeBankSize,
EntityLimits::npc::Null,
EntityLimits::merc::Null,
EntityLimits::bot::Null,
EntityLimits::pet::Null,
EntityLimits::NPC::Null,
EntityLimits::Merc::Null,
EntityLimits::Bot::Null,
EntityLimits::Pet::Null,
Titanium::Null,
SoF::Null,
SoD::Null,
@@ -89,10 +89,10 @@ size_t EQEmu::inventory::GetInventoryTypeSize(versions::InventoryVersion invento
UF::invtype::InvTypeSharedBankSize,
RoF::invtype::InvTypeSharedBankSize,
RoF2::invtype::InvTypeSharedBankSize,
EntityLimits::npc::Null,
EntityLimits::merc::Null,
EntityLimits::bot::Null,
EntityLimits::pet::Null,
EntityLimits::NPC::Null,
EntityLimits::Merc::Null,
EntityLimits::Bot::Null,
EntityLimits::Pet::Null,
Titanium::Null,
SoF::Null,
SoD::Null,
@@ -109,10 +109,10 @@ size_t EQEmu::inventory::GetInventoryTypeSize(versions::InventoryVersion invento
UF::invtype::InvTypeTradeSize,
RoF::invtype::InvTypeTradeSize,
RoF2::invtype::InvTypeTradeSize,
EntityLimits::npc::InvTypeTradeSize,
EntityLimits::merc::InvTypeTradeSize,
EntityLimits::bot::InvTypeTradeSize, // client thinks this is another client
EntityLimits::pet::InvTypeTradeSize,
EntityLimits::NPC::InvTypeTradeSize,
EntityLimits::Merc::InvTypeTradeSize,
EntityLimits::Bot::InvTypeTradeSize, // client thinks this is another client
EntityLimits::Pet::InvTypeTradeSize,
Titanium::invtype::InvTypeTradeSize,
SoF::invtype::InvTypeTradeSize,
SoD::invtype::InvTypeTradeSize,
@@ -129,10 +129,10 @@ size_t EQEmu::inventory::GetInventoryTypeSize(versions::InventoryVersion invento
UF::invtype::InvTypeWorldSize,
RoF::invtype::InvTypeWorldSize,
RoF2::invtype::InvTypeWorldSize,
EntityLimits::npc::Null,
EntityLimits::merc::Null,
EntityLimits::bot::Null,
EntityLimits::pet::Null,
EntityLimits::NPC::Null,
EntityLimits::Merc::Null,
EntityLimits::Bot::Null,
EntityLimits::Pet::Null,
Titanium::Null,
SoF::Null,
SoD::Null,
@@ -149,10 +149,10 @@ size_t EQEmu::inventory::GetInventoryTypeSize(versions::InventoryVersion invento
UF::invtype::InvTypeLimboSize,
RoF::invtype::InvTypeLimboSize,
RoF2::invtype::InvTypeLimboSize,
EntityLimits::npc::Null,
EntityLimits::merc::Null,
EntityLimits::bot::Null,
EntityLimits::pet::Null,
EntityLimits::NPC::Null,
EntityLimits::Merc::Null,
EntityLimits::Bot::Null,
EntityLimits::Pet::Null,
Titanium::Null,
SoF::Null,
SoD::Null,
@@ -169,10 +169,10 @@ size_t EQEmu::inventory::GetInventoryTypeSize(versions::InventoryVersion invento
UF::invtype::InvTypeTributeSize,
RoF::invtype::InvTypeTributeSize,
RoF2::invtype::InvTypeTributeSize,
EntityLimits::npc::Null,
EntityLimits::merc::Null,
EntityLimits::bot::Null,
EntityLimits::pet::Null,
EntityLimits::NPC::Null,
EntityLimits::Merc::Null,
EntityLimits::Bot::Null,
EntityLimits::Pet::Null,
Titanium::Null,
SoF::Null,
SoD::Null,
@@ -189,10 +189,10 @@ size_t EQEmu::inventory::GetInventoryTypeSize(versions::InventoryVersion invento
UF::Null,
RoF::Null, //RoF::invtype::InvTypeTrophyTributeSize,
RoF2::Null, //RoF2::invtype::InvTypeTrophyTributeSize,
EntityLimits::npc::Null,
EntityLimits::merc::Null,
EntityLimits::bot::Null,
EntityLimits::pet::Null,
EntityLimits::NPC::Null,
EntityLimits::Merc::Null,
EntityLimits::Bot::Null,
EntityLimits::Pet::Null,
Titanium::Null,
SoF::Null,
SoD::Null,
@@ -209,10 +209,10 @@ size_t EQEmu::inventory::GetInventoryTypeSize(versions::InventoryVersion invento
UF::Null, //UF::invtype::InvTypeGuildTributeSize,
RoF::Null, //RoF::invtype::InvTypeGuildTributeSize,
RoF2::Null, //RoF2::invtype::InvTypeGuildTributeSize,
EntityLimits::npc::Null,
EntityLimits::merc::Null,
EntityLimits::bot::Null,
EntityLimits::pet::Null,
EntityLimits::NPC::Null,
EntityLimits::Merc::Null,
EntityLimits::Bot::Null,
EntityLimits::Pet::Null,
Titanium::Null,
SoF::Null,
SoD::Null,
@@ -229,10 +229,10 @@ size_t EQEmu::inventory::GetInventoryTypeSize(versions::InventoryVersion invento
UF::invtype::InvTypeMerchantSize,
RoF::invtype::InvTypeMerchantSize,
RoF2::invtype::InvTypeMerchantSize,
EntityLimits::npc::Null,
EntityLimits::merc::Null,
EntityLimits::bot::Null,
EntityLimits::pet::Null,
EntityLimits::NPC::Null,
EntityLimits::Merc::Null,
EntityLimits::Bot::Null,
EntityLimits::Pet::Null,
Titanium::invtype::InvTypeMerchantSize,
SoF::invtype::InvTypeMerchantSize,
SoD::invtype::InvTypeMerchantSize,
@@ -249,10 +249,10 @@ size_t EQEmu::inventory::GetInventoryTypeSize(versions::InventoryVersion invento
UF::Null,
RoF::Null, //RoF::invtype::InvTypeDeletedSize,
RoF2::Null, //RoF2::invtype::InvTypeDeletedSize,
EntityLimits::npc::Null,
EntityLimits::merc::Null,
EntityLimits::bot::Null,
EntityLimits::pet::Null,
EntityLimits::NPC::Null,
EntityLimits::Merc::Null,
EntityLimits::Bot::Null,
EntityLimits::Pet::Null,
Titanium::Null,
SoF::Null,
SoD::Null,
@@ -269,10 +269,10 @@ size_t EQEmu::inventory::GetInventoryTypeSize(versions::InventoryVersion invento
UF::invtype::InvTypeCorpseSize,
RoF::invtype::InvTypeCorpseSize,
RoF2::invtype::InvTypeCorpseSize,
EntityLimits::npc::Null, //InvTypeCorpseSize,
EntityLimits::merc::Null, //InvTypeCorpseSize,
EntityLimits::bot::Null, //InvTypeCorpseSize,
EntityLimits::pet::Null, //InvTypeCorpseSize,
EntityLimits::NPC::Null, //InvTypeCorpseSize,
EntityLimits::Merc::Null, //InvTypeCorpseSize,
EntityLimits::Bot::Null, //InvTypeCorpseSize,
EntityLimits::Pet::Null, //InvTypeCorpseSize,
Titanium::Null,
SoF::Null,
SoD::Null,
@@ -289,10 +289,10 @@ size_t EQEmu::inventory::GetInventoryTypeSize(versions::InventoryVersion invento
legacy::TYPE_BAZAAR_SIZE, //UF::invtype::InvTypeBazaarSize,
legacy::TYPE_BAZAAR_SIZE, //RoF::invtype::InvTypeBazaarSize,
legacy::TYPE_BAZAAR_SIZE, //RoF2::invtype::InvTypeBazaarSize,
EntityLimits::npc::Null,
EntityLimits::merc::Null,
EntityLimits::bot::Null,
EntityLimits::pet::Null,
EntityLimits::NPC::Null,
EntityLimits::Merc::Null,
EntityLimits::Bot::Null,
EntityLimits::Pet::Null,
Titanium::Null, //Titanium::invtype::InvTypeBazaarSize,
SoF::Null, //SoF::invtype::InvTypeBazaarSize,
SoD::Null, //SoD::invtype::InvTypeBazaarSize,
@@ -309,10 +309,10 @@ size_t EQEmu::inventory::GetInventoryTypeSize(versions::InventoryVersion invento
UF::invtype::InvTypeInspectSize,
RoF::invtype::InvTypeInspectSize,
RoF2::invtype::InvTypeInspectSize,
EntityLimits::npc::Null,
EntityLimits::merc::Null,
EntityLimits::bot::Null,
EntityLimits::pet::Null,
EntityLimits::NPC::Null,
EntityLimits::Merc::Null,
EntityLimits::Bot::Null,
EntityLimits::Pet::Null,
Titanium::invtype::InvTypeInspectSize,
SoF::invtype::InvTypeInspectSize,
SoD::invtype::InvTypeInspectSize,
@@ -329,10 +329,10 @@ size_t EQEmu::inventory::GetInventoryTypeSize(versions::InventoryVersion invento
UF::Null,
RoF::Null, //RoF::invtype::InvTypeRealEstateSize,
RoF2::Null, //RoF2::invtype::InvTypeRealEstateSize
EntityLimits::npc::Null,
EntityLimits::merc::Null,
EntityLimits::bot::Null,
EntityLimits::pet::Null,
EntityLimits::NPC::Null,
EntityLimits::Merc::Null,
EntityLimits::Bot::Null,
EntityLimits::Pet::Null,
Titanium::Null,
SoF::Null,
SoD::Null,
@@ -349,10 +349,10 @@ size_t EQEmu::inventory::GetInventoryTypeSize(versions::InventoryVersion invento
UF::invtype::InvTypeViewMODPCSize,
RoF::invtype::InvTypeViewMODPCSize,
RoF2::invtype::InvTypeViewMODPCSize,
EntityLimits::npc::Null,
EntityLimits::merc::Null,
EntityLimits::bot::Null,
EntityLimits::pet::Null,
EntityLimits::NPC::Null,
EntityLimits::Merc::Null,
EntityLimits::Bot::Null,
EntityLimits::Pet::Null,
Titanium::invtype::InvTypeViewMODPCSize,
SoF::invtype::InvTypeViewMODPCSize,
SoD::invtype::InvTypeViewMODPCSize,
@@ -369,10 +369,10 @@ size_t EQEmu::inventory::GetInventoryTypeSize(versions::InventoryVersion invento
UF::invtype::InvTypeViewMODBankSize,
RoF::invtype::InvTypeViewMODBankSize,
RoF2::invtype::InvTypeViewMODBankSize,
EntityLimits::npc::Null,
EntityLimits::merc::Null,
EntityLimits::bot::Null,
EntityLimits::pet::Null,
EntityLimits::NPC::Null,
EntityLimits::Merc::Null,
EntityLimits::Bot::Null,
EntityLimits::Pet::Null,
Titanium::invtype::InvTypeViewMODBankSize,
SoF::invtype::InvTypeViewMODBankSize,
SoD::invtype::InvTypeViewMODBankSize,
@@ -389,10 +389,10 @@ size_t EQEmu::inventory::GetInventoryTypeSize(versions::InventoryVersion invento
UF::invtype::InvTypeViewMODSharedBankSize,
RoF::invtype::InvTypeViewMODSharedBankSize,
RoF2::invtype::InvTypeViewMODSharedBankSize,
EntityLimits::npc::Null,
EntityLimits::merc::Null,
EntityLimits::bot::Null,
EntityLimits::pet::Null,
EntityLimits::NPC::Null,
EntityLimits::Merc::Null,
EntityLimits::Bot::Null,
EntityLimits::Pet::Null,
Titanium::invtype::InvTypeViewMODSharedBankSize,
SoF::invtype::InvTypeViewMODSharedBankSize,
SoD::invtype::InvTypeViewMODSharedBankSize,
@@ -409,10 +409,10 @@ size_t EQEmu::inventory::GetInventoryTypeSize(versions::InventoryVersion invento
UF::invtype::InvTypeViewMODLimboSize,
RoF::invtype::InvTypeViewMODLimboSize,
RoF2::invtype::InvTypeViewMODLimboSize,
EntityLimits::npc::Null,
EntityLimits::merc::Null,
EntityLimits::bot::Null,
EntityLimits::pet::Null,
EntityLimits::NPC::Null,
EntityLimits::Merc::Null,
EntityLimits::Bot::Null,
EntityLimits::Pet::Null,
Titanium::invtype::InvTypeViewMODLimboSize,
SoF::invtype::InvTypeViewMODLimboSize,
SoD::invtype::InvTypeViewMODLimboSize,
@@ -429,10 +429,10 @@ size_t EQEmu::inventory::GetInventoryTypeSize(versions::InventoryVersion invento
UF::invtype::InvTypeAltStorageSize,
RoF::invtype::InvTypeAltStorageSize,
RoF2::invtype::InvTypeAltStorageSize,
EntityLimits::npc::Null,
EntityLimits::merc::Null,
EntityLimits::bot::Null,
EntityLimits::pet::Null,
EntityLimits::NPC::Null,
EntityLimits::Merc::Null,
EntityLimits::Bot::Null,
EntityLimits::Pet::Null,
Titanium::Null,
SoF::Null,
SoD::Null,
@@ -449,10 +449,10 @@ size_t EQEmu::inventory::GetInventoryTypeSize(versions::InventoryVersion invento
UF::invtype::InvTypeArchivedSize,
RoF::invtype::InvTypeArchivedSize,
RoF2::invtype::InvTypeArchivedSize,
EntityLimits::npc::Null,
EntityLimits::merc::Null,
EntityLimits::bot::Null,
EntityLimits::pet::Null,
EntityLimits::NPC::Null,
EntityLimits::Merc::Null,
EntityLimits::Bot::Null,
EntityLimits::Pet::Null,
Titanium::Null,
SoF::Null,
SoD::Null,
@@ -469,10 +469,10 @@ size_t EQEmu::inventory::GetInventoryTypeSize(versions::InventoryVersion invento
UF::Null,
RoF::invtype::InvTypeMailSize,
RoF2::invtype::InvTypeMailSize,
EntityLimits::npc::Null,
EntityLimits::merc::Null,
EntityLimits::bot::Null,
EntityLimits::pet::Null,
EntityLimits::NPC::Null,
EntityLimits::Merc::Null,
EntityLimits::Bot::Null,
EntityLimits::Pet::Null,
Titanium::Null,
SoF::Null,
SoD::Null,
@@ -489,10 +489,10 @@ size_t EQEmu::inventory::GetInventoryTypeSize(versions::InventoryVersion invento
UF::Null,
RoF::invtype::InvTypeGuildTrophyTributeSize,
RoF2::invtype::InvTypeGuildTrophyTributeSize,
EntityLimits::npc::Null,
EntityLimits::merc::Null,
EntityLimits::bot::Null,
EntityLimits::pet::Null,
EntityLimits::NPC::Null,
EntityLimits::Merc::Null,
EntityLimits::Bot::Null,
EntityLimits::Pet::Null,
Titanium::Null,
SoF::Null,
SoD::Null,
@@ -509,10 +509,10 @@ size_t EQEmu::inventory::GetInventoryTypeSize(versions::InventoryVersion invento
UF::Null,
RoF::Null,
RoF2::invtype::InvTypeKronoSize,
EntityLimits::npc::Null,
EntityLimits::merc::Null,
EntityLimits::bot::Null,
EntityLimits::pet::Null,
EntityLimits::NPC::Null,
EntityLimits::Merc::Null,
EntityLimits::Bot::Null,
EntityLimits::Pet::Null,
Titanium::Null,
SoF::Null,
SoD::Null,
@@ -529,10 +529,10 @@ size_t EQEmu::inventory::GetInventoryTypeSize(versions::InventoryVersion invento
UF::invtype::InvTypeOtherSize,
RoF::invtype::InvTypeOtherSize,
RoF2::invtype::InvTypeOtherSize,
EntityLimits::npc::Null,
EntityLimits::merc::Null,
EntityLimits::bot::Null,
EntityLimits::pet::Null,
EntityLimits::NPC::Null,
EntityLimits::Merc::Null,
EntityLimits::Bot::Null,
EntityLimits::Pet::Null,
Titanium::Null,
SoF::Null,
SoD::Null,
@@ -559,10 +559,10 @@ uint64 EQEmu::inventory::GetPossessionsBitmask(versions::InventoryVersion invent
UF::Null, //0x000000027FFFFFFF,
RoF::Null, //0x00000003FFFFFFFF,
RoF2::Null, //0x00000003FFFFFFFF,
EntityLimits::npc::Null,
EntityLimits::merc::Null,
EntityLimits::bot::Null,
EntityLimits::pet::Null,
EntityLimits::NPC::Null,
EntityLimits::Merc::Null,
EntityLimits::Bot::Null,
EntityLimits::Pet::Null,
Titanium::Null,
SoF::Null,
SoD::Null,
@@ -585,10 +585,10 @@ bool EQEmu::inventory::GetAllowEmptyBagInBag(versions::InventoryVersion inventor
UF::inventory::AllowEmptyBagInBag,
RoF::False, //RoF::inventory::AllowEmptyBagInBag,
RoF2::False, //RoF2::inventory::AllowEmptyBagInBag,
EntityLimits::npc::False,
EntityLimits::merc::False,
EntityLimits::bot::False,
EntityLimits::pet::False,
EntityLimits::NPC::False,
EntityLimits::Merc::False,
EntityLimits::Bot::False,
EntityLimits::Pet::False,
Titanium::False,
SoF::False,
SoD::False,
@@ -611,10 +611,10 @@ bool EQEmu::inventory::GetAllowClickCastFromBag(versions::InventoryVersion inven
UF::inventory::AllowClickCastFromBag,
RoF::inventory::AllowClickCastFromBag,
RoF2::inventory::AllowClickCastFromBag,
EntityLimits::npc::False,
EntityLimits::merc::False,
EntityLimits::bot::False,
EntityLimits::pet::False,
EntityLimits::NPC::False,
EntityLimits::Merc::False,
EntityLimits::Bot::False,
EntityLimits::Pet::False,
Titanium::False,
SoF::False,
SoD::False,
@@ -637,10 +637,10 @@ bool EQEmu::inventory::GetConcatenateInvTypeLimbo(versions::InventoryVersion inv
UF::inventory::ConcatenateInvTypeLimbo,
RoF::inventory::ConcatenateInvTypeLimbo,
RoF2::inventory::ConcatenateInvTypeLimbo,
EntityLimits::npc::False,
EntityLimits::merc::False,
EntityLimits::bot::False,
EntityLimits::pet::False,
EntityLimits::NPC::False,
EntityLimits::Merc::False,
EntityLimits::Bot::False,
EntityLimits::Pet::False,
Titanium::False,
SoF::False,
SoD::False,
@@ -663,10 +663,10 @@ bool EQEmu::inventory::GetAllowOverLevelEquipment(versions::InventoryVersion inv
UF::inventory::AllowOverLevelEquipment,
RoF::inventory::AllowOverLevelEquipment,
RoF2::inventory::AllowOverLevelEquipment,
EntityLimits::npc::False,
EntityLimits::merc::False,
EntityLimits::bot::False,
EntityLimits::pet::False,
EntityLimits::NPC::False,
EntityLimits::Merc::False,
EntityLimits::Bot::False,
EntityLimits::Pet::False,
Titanium::False,
SoF::False,
SoD::False,
@@ -741,10 +741,10 @@ bool EQEmu::behavior::GetCoinHasWeight(versions::InventoryVersion inventory_vers
UF::behavior::CoinHasWeight,
RoF::behavior::CoinHasWeight,
RoF::behavior::CoinHasWeight,
EntityLimits::npc::True, //CoinHasWeight,
EntityLimits::merc::True, //CoinHasWeight,
EntityLimits::bot::True, //CoinHasWeight,
EntityLimits::pet::True, //CoinHasWeight,
EntityLimits::NPC::True, //CoinHasWeight,
EntityLimits::Merc::True, //CoinHasWeight,
EntityLimits::Bot::True, //CoinHasWeight,
EntityLimits::Pet::True, //CoinHasWeight,
Titanium::False,
SoF::False,
SoD::False,