diff --git a/changelog.txt b/changelog.txt index ed7e134cf..b0866ec17 100644 --- a/changelog.txt +++ b/changelog.txt @@ -5,6 +5,7 @@ EQEMu Changelog (Started on Sept 24, 2003 15:50) Secrets: Identified object size and solidtype as flags. Exported them as functions to Perl. demonstar55: Don't use the hack for charms that doesn't work on RoF demonstar55: UF too +demonstar55: Tit == 11/13/2014 == Kayen: Implemented target type (44) 'Beams' (which projects an AE infront of caster with a specified length and width). diff --git a/common/patches/titanium.cpp b/common/patches/titanium.cpp index 0366e73d8..4d400c9b7 100644 --- a/common/patches/titanium.cpp +++ b/common/patches/titanium.cpp @@ -1661,7 +1661,7 @@ namespace Titanium int16 slot_id = ServerToTitaniumSlot(slot_id_in); uint32 merchant_slot = inst->GetMerchantSlot(); int16 charges = inst->GetCharges(); - const Item_Struct *item = inst->GetItem(); + const Item_Struct *item = inst->GetUnscaledItem(); int i; uint32 sub_length; @@ -1673,7 +1673,7 @@ namespace Titanium (merchant_slot == 0) ? slot_id_in : merchant_slot, inst->GetPrice(), (merchant_slot == 0) ? 1 : inst->GetMerchantCount(), - 0, + inst->IsScaling() ? inst->GetExp() / 100 : 0, //merchant_slot, //instance ID, bullshit for now (merchant_slot == 0) ? inst->GetSerialNumber() : merchant_slot, 0, // item recast timer timestamp field (aka..last_cast_time field in SoF+ clients)