Merge branch 'master' into Playerbot

src/server/game/Entities/Item/Item.cpp

@@ -26,9 +26,9 @@
 #include "ScriptMgr.h"
 #include "SpellInfo.h"
 #include "SpellMgr.h"
-#include "WorldPacket.h"
-#include "Tokenize.h"
 #include "StringConvert.h"
+#include "Tokenize.h"
+#include "WorldPacket.h"
 
 void AddItemsSetItem(Player* player, Item* item)
 {

src/server/game/Entities/Item/Item.h

@@ -36,7 +36,7 @@ struct ItemSetEffect
 };
 
 // EnumUtils: DESCRIBE THIS
-enum InventoryResult
+enum InventoryResult : uint8
 {
     EQUIP_ERR_OK                                 = 0,
     EQUIP_ERR_CANT_EQUIP_LEVEL_I                 = 1,
@@ -158,7 +158,7 @@ enum SellResult
 };
 
 // -1 from client enchantment slot number
-enum EnchantmentSlot
+enum EnchantmentSlot : uint8
 {
     PERM_ENCHANTMENT_SLOT           = 0,
     TEMP_ENCHANTMENT_SLOT           = 1,

src/server/game/Entities/Item/enuminfo_Item.cpp

@@ -15,8 +15,8 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "Item.h"
 #include "Define.h"
+#include "Item.h"
 #include "SmartEnum.h"
 #include <stdexcept>