From 30922afd0801fa5aefa28b42122e2d8b340c4967 Mon Sep 17 00:00:00 2001 From: "Michael Cook (mackal)" Date: Sat, 15 Nov 2014 01:01:57 -0500 Subject: [PATCH] Remove scaling hack for client 62 (untested) --- changelog.txt | 1 + common/patches/client62.cpp | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/changelog.txt b/changelog.txt index 92c4164dc..506c4d2ff 100644 --- a/changelog.txt +++ b/changelog.txt @@ -8,6 +8,7 @@ demonstar55: UF too demonstar55: Tit demonstar55: SoF demonstar55: SoD +demonstar55: 62 (untested) == 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/client62.cpp b/common/patches/client62.cpp index d734a29ec..c291d2bc4 100644 --- a/common/patches/client62.cpp +++ b/common/patches/client62.cpp @@ -1231,7 +1231,7 @@ namespace Client62 int16 slot_id = ServerToClient62Slot(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; @@ -1244,7 +1244,7 @@ namespace Client62 (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 // The 'Merchant Slot' needs to be some unique id for bazaar to work properly (merchant_slot == 0) ? inst->GetSerialNumber() : merchant_slot,