From 0ad7c4470b0fa8120460eb41f31a3b7d57b33e25 Mon Sep 17 00:00:00 2001 From: Uleat Date: Sun, 27 Jul 2014 22:18:17 -0400 Subject: [PATCH] GCC fix for last dictionary push (hopefully) --- common/eq_dictionary.cpp | 6 +++--- common/patches/Client62_constants.h | 4 ++-- common/patches/RoF_constants.h | 4 ++-- common/patches/SoD_constants.h | 4 ++-- common/patches/SoF_constants.h | 4 ++-- common/patches/Titanium_constants.h | 4 ++-- common/patches/Underfoot_constants.h | 4 ++-- 7 files changed, 15 insertions(+), 15 deletions(-) diff --git a/common/eq_dictionary.cpp b/common/eq_dictionary.cpp index 7119d86a6..7ef36d8a7 100644 --- a/common/eq_dictionary.cpp +++ b/common/eq_dictionary.cpp @@ -901,7 +901,7 @@ bool EQLimits::CoinHasWeight(uint32 version) { } uint32 EQLimits::BandoliersCount(uint32 version) { - static const bool local[_EmuClientCount] = { + static const uint32 local[_EmuClientCount] = { /*Unknown*/ NOT_USED, /*62*/ EmuConstants::BANDOLIERS_COUNT, /*Titanium*/ EmuConstants::BANDOLIERS_COUNT, @@ -921,7 +921,7 @@ uint32 EQLimits::BandoliersCount(uint32 version) { } uint32 EQLimits::BandolierSize(uint32 version) { - static const bool local[_EmuClientCount] = { + static const uint32 local[_EmuClientCount] = { /*Unknown*/ NOT_USED, /*62*/ EmuConstants::BANDOLIER_SIZE, /*Titanium*/ EmuConstants::BANDOLIER_SIZE, @@ -941,7 +941,7 @@ uint32 EQLimits::BandolierSize(uint32 version) { } uint32 EQLimits::PotionBeltSize(uint32 version) { - static const bool local[_EmuClientCount] = { + static const uint32 local[_EmuClientCount] = { /*Unknown*/ NOT_USED, /*62*/ EmuConstants::POTION_BELT_SIZE, /*Titanium*/ EmuConstants::POTION_BELT_SIZE, diff --git a/common/patches/Client62_constants.h b/common/patches/Client62_constants.h index 07d877124..6655bcd0c 100644 --- a/common/patches/Client62_constants.h +++ b/common/patches/Client62_constants.h @@ -53,7 +53,7 @@ namespace Client62 { MapGuildTrophyTribute, MapOther, _MapCount - }; + } InventoryMaps; } namespace slots { @@ -96,7 +96,7 @@ namespace Client62 { _MainGeneralBegin = MainGeneral1, _MainGeneralEnd = MainGeneral8, _MainGeneralCount = (_MainGeneralEnd - _MainGeneralBegin + 1) - }; + } EquipmentSlots; } namespace consts { diff --git a/common/patches/RoF_constants.h b/common/patches/RoF_constants.h index 4fdbe0187..075ca3b0d 100644 --- a/common/patches/RoF_constants.h +++ b/common/patches/RoF_constants.h @@ -52,7 +52,7 @@ namespace RoF { MapGuildTrophyTribute, MapOther, _MapCount - }; + } InventoryMaps; } namespace slots { @@ -98,7 +98,7 @@ namespace RoF { _MainGeneralBegin = MainGeneral1, _MainGeneralEnd = MainGeneral10, _MainGeneralCount = (_MainGeneralEnd - _MainGeneralBegin + 1) - }; + } EquipmentSlots; } namespace consts { diff --git a/common/patches/SoD_constants.h b/common/patches/SoD_constants.h index 7c359a8ab..0b0120cd8 100644 --- a/common/patches/SoD_constants.h +++ b/common/patches/SoD_constants.h @@ -53,7 +53,7 @@ namespace SoD { MapGuildTrophyTribute, MapOther, _MapCount - }; + } InventoryMaps; } namespace slots { @@ -97,7 +97,7 @@ namespace SoD { _MainGeneralBegin = MainGeneral1, _MainGeneralEnd = MainGeneral8, _MainGeneralCount = (_MainGeneralEnd - _MainGeneralBegin + 1) - }; + } EquipmentSlots; } namespace consts { diff --git a/common/patches/SoF_constants.h b/common/patches/SoF_constants.h index b97d1fc71..c8eb1df86 100644 --- a/common/patches/SoF_constants.h +++ b/common/patches/SoF_constants.h @@ -53,7 +53,7 @@ namespace SoF { MapGuildTrophyTribute, MapOther, _MapCount - }; + } InventoryMaps; } namespace slots { @@ -97,7 +97,7 @@ namespace SoF { _MainGeneralBegin = MainGeneral1, _MainGeneralEnd = MainGeneral8, _MainGeneralCount = (_MainGeneralEnd - _MainGeneralBegin + 1) - }; + } EquipmentSlots; } namespace consts { diff --git a/common/patches/Titanium_constants.h b/common/patches/Titanium_constants.h index 9ee4b01f7..4d95d3355 100644 --- a/common/patches/Titanium_constants.h +++ b/common/patches/Titanium_constants.h @@ -53,7 +53,7 @@ namespace Titanium { MapGuildTrophyTribute, MapOther, _MapCount - }; + } InventoryMaps; } namespace slots { @@ -96,7 +96,7 @@ namespace Titanium { _MainGeneralBegin = MainGeneral1, _MainGeneralEnd = MainGeneral8, _MainGeneralCount = (_MainGeneralEnd - _MainGeneralBegin + 1) - }; + } EquipmentSlots; } namespace consts { diff --git a/common/patches/Underfoot_constants.h b/common/patches/Underfoot_constants.h index 91aaf4ebf..fd84226ee 100644 --- a/common/patches/Underfoot_constants.h +++ b/common/patches/Underfoot_constants.h @@ -53,7 +53,7 @@ namespace Underfoot { MapGuildTrophyTribute, MapOther, _MapCount - }; + } InventoryMaps; } namespace slots { @@ -97,7 +97,7 @@ namespace Underfoot { _MainGeneralBegin = MainGeneral1, _MainGeneralEnd = MainGeneral8, _MainGeneralCount = (_MainGeneralEnd - _MainGeneralBegin + 1) - }; + } EquipmentSlots; } namespace consts {