diff --git a/common/client_version.h b/common/client_version.h index f721c0337..7483f6be2 100644 --- a/common/client_version.h +++ b/common/client_version.h @@ -60,7 +60,7 @@ namespace EQEmu }; static const ClientVersion LastClientVersion = ClientVersion::RoF2; - static const size_t ClientVersionCount = (static_cast(LastClientVersion) + 1); + static const unsigned int ClientVersionCount = 8; //(static_cast(LastClientVersion) + 1); - travis either doesn't like this or decl 'size_t' extern bool IsValidClientVersion(ClientVersion client_version); extern ClientVersion ValidateClientVersion(ClientVersion client_version); diff --git a/common/inventory_version.h b/common/inventory_version.h index bee34bcf3..061011c6a 100644 --- a/common/inventory_version.h +++ b/common/inventory_version.h @@ -20,7 +20,6 @@ #ifndef COMMON_INVENTORY_VERSION_H #define COMMON_INVENTORY_VERSION_H -#include "types.h" #include "client_version.h" @@ -45,7 +44,7 @@ namespace EQEmu static const InventoryVersion LastInventoryVersion = InventoryVersion::Pet; static const InventoryVersion LastPCInventoryVersion = InventoryVersion::RoF2; static const InventoryVersion LastNonPCInventoryVersion = InventoryVersion::Pet; - static const size_t InventoryVersionCount = (static_cast(LastInventoryVersion) + 1); + static const unsigned int InventoryVersionCount = 12; //(static_cast(LastInventoryVersion) + 1); - travis either doesn't like this or decl 'size_t' extern bool IsValidInventoryVersion(InventoryVersion inventory_version); extern bool IsValidPCInventoryVersion(InventoryVersion inventory_version);