pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-04-12 14:02:26 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Remove scaling hack for Titanium

Browse Source
This commit is contained in:
Michael Cook (mackal) 2014-11-15 00:29:56 -05:00
parent 5dc3a5ab20
commit 96242f6c5e
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
changelog.txt
View File

@ -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. 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: Don't use the hack for charms that doesn't work on RoF
demonstar55: UF too demonstar55: UF too
demonstar55: Tit
== 11/13/2014 == == 11/13/2014 ==
Kayen: Implemented target type (44) 'Beams' (which projects an AE infront of caster with a specified length and width). Kayen: Implemented target type (44) 'Beams' (which projects an AE infront of caster with a specified length and width).

4
common/patches/titanium.cpp
View File

@ -1661,7 +1661,7 @@ namespace Titanium
int16 slot_id = ServerToTitaniumSlot(slot_id_in); int16 slot_id = ServerToTitaniumSlot(slot_id_in);
uint32 merchant_slot = inst->GetMerchantSlot(); uint32 merchant_slot = inst->GetMerchantSlot();
int16 charges = inst->GetCharges(); int16 charges = inst->GetCharges();
const Item_Struct *item = inst->GetItem(); const Item_Struct *item = inst->GetUnscaledItem();
int i; int i;
uint32 sub_length; uint32 sub_length;
@ -1673,7 +1673,7 @@ namespace Titanium
(merchant_slot == 0) ? slot_id_in : merchant_slot, (merchant_slot == 0) ? slot_id_in : merchant_slot,
inst->GetPrice(), inst->GetPrice(),
(merchant_slot == 0) ? 1 : inst->GetMerchantCount(), (merchant_slot == 0) ? 1 : inst->GetMerchantCount(),
0, inst->IsScaling() ? inst->GetExp() / 100 : 0,
//merchant_slot, //instance ID, bullshit for now //merchant_slot, //instance ID, bullshit for now
(merchant_slot == 0) ? inst->GetSerialNumber() : merchant_slot, (merchant_slot == 0) ? inst->GetSerialNumber() : merchant_slot,
0, // item recast timer timestamp field (aka..last_cast_time field in SoF+ clients) 0, // item recast timer timestamp field (aka..last_cast_time field in SoF+ clients)