From 23115ca1778962b82e93ce3090f86f90c7dd0a82 Mon Sep 17 00:00:00 2001 From: Uleat Date: Sun, 2 Apr 2017 15:35:13 -0400 Subject: [PATCH] Disabled deity checks in item swaps until issue is 100% resolved --- common/deity.h | 5 +++-- common/inventory_profile.cpp | 8 ++++---- zone/inventory.cpp | 4 +++- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/common/deity.h b/common/deity.h index fa56a9d8f..f754352a0 100644 --- a/common/deity.h +++ b/common/deity.h @@ -49,7 +49,7 @@ namespace EQEmu }; enum DeityTypeBit : uint32 { - bit_DeityAll = 0x00000000, + bit_DeityNone = 0x00000000, bit_DeityAgnostic = 0x00000001, bit_DeityBertoxxulous = 0x00000002, bit_DeityBrellSirilis = 0x00000004, @@ -66,7 +66,8 @@ namespace EQEmu bit_DeitySolusekRo = 0x00002000, bit_DeityTheTribunal = 0x00004000, bit_DeityTunare = 0x00008000, - bit_DeityVeeshan = 0x00010000 + bit_DeityVeeshan = 0x00010000, + bit_DeityAll = 0xFFFFFFFF }; extern DeityTypeBit ConvertDeityTypeToDeityTypeBit(DeityType deity_type); diff --git a/common/inventory_profile.cpp b/common/inventory_profile.cpp index 4f64c7a58..7ec73d3f2 100644 --- a/common/inventory_profile.cpp +++ b/common/inventory_profile.cpp @@ -264,10 +264,10 @@ bool EQEmu::InventoryProfile::SwapItem(int16 slot_a, int16 slot_b, SwapItemFailS fail_state = swapRaceClass; return false; } - if (deity_id && item_a->Deity && !(deity::ConvertDeityTypeToDeityTypeBit((deity::DeityType)deity_id) & item_a->Deity)) { + /*if (deity_id && item_a->Deity && !(deity::ConvertDeityTypeToDeityTypeBit((deity::DeityType)deity_id) & item_a->Deity)) { fail_state = swapDeity; return false; - } + }*/ if (level && item_a->ReqLevel && level < item_a->ReqLevel) { fail_state = swapLevel; return false; @@ -290,10 +290,10 @@ bool EQEmu::InventoryProfile::SwapItem(int16 slot_a, int16 slot_b, SwapItemFailS fail_state = swapRaceClass; return false; } - if (deity_id && item_b->Deity && !(deity::ConvertDeityTypeToDeityTypeBit((deity::DeityType)deity_id) & item_b->Deity)) { + /*if (deity_id && item_b->Deity && !(deity::ConvertDeityTypeToDeityTypeBit((deity::DeityType)deity_id) & item_b->Deity)) { fail_state = swapDeity; return false; - } + }*/ if (level && item_b->ReqLevel && level < item_b->ReqLevel) { fail_state = swapLevel; return false; diff --git a/zone/inventory.cpp b/zone/inventory.cpp index 42520058c..916818166 100644 --- a/zone/inventory.cpp +++ b/zone/inventory.cpp @@ -1833,8 +1833,10 @@ bool Client::SwapItem(MoveItem_Struct* move_in) { else if (fail_state == EQEmu::InventoryProfile::swapLevel) fail_message = "You are not sufficient level to use this item."; - if (fail_message) + if (fail_message) { Message(CC_Red, "%s", fail_message); + //Log(Logs::General, Logs::Error, "[%s] %s (r:%u, c:%u, d:%u, l:%u)", GetCleanName(), fail_message, GetRace(), GetClass(), GetDeity(), GetLevel()); + } return false; }