mirror of
https://github.com/EQEmu/Server.git
synced 2026-04-08 05:52:26 +00:00
Clean up of RoF+ Item Packets.
This commit is contained in:
parent
a0972e7564
commit
3bb816ad1d
@ -4854,27 +4854,8 @@ namespace RoF
|
|||||||
ss.write((const char*)&evotop, sizeof(RoF::structs::EvolvingItem));
|
ss.write((const char*)&evotop, sizeof(RoF::structs::EvolvingItem));
|
||||||
}
|
}
|
||||||
//ORNAMENT IDFILE / ICON
|
//ORNAMENT IDFILE / ICON
|
||||||
uint16 ornaIcon = 0;
|
uint32 ornaIcon = 0;
|
||||||
int32 heroModel = 0;
|
uint32 heroModel = 0;
|
||||||
/*
|
|
||||||
if (inst->GetOrnamentationAug(ornamentationAugtype))
|
|
||||||
{
|
|
||||||
const Item_Struct *aug_weap = inst->GetOrnamentationAug(ornamentationAugtype)->GetItem();
|
|
||||||
//Mainhand
|
|
||||||
ss.write(aug_weap->IDFile, strlen(aug_weap->IDFile));
|
|
||||||
ss.write((const char*)&null_term, sizeof(uint8));
|
|
||||||
//Offhand
|
|
||||||
ss.write(aug_weap->IDFile, strlen(aug_weap->IDFile));
|
|
||||||
ss.write((const char*)&null_term, sizeof(uint8));
|
|
||||||
//Icon
|
|
||||||
ornaIcon = aug_weap->Icon;
|
|
||||||
if (aug_weap->HerosForgeModel > 0)
|
|
||||||
{
|
|
||||||
heroModel = (aug_weap->HerosForgeModel * 100) + Inventory::CalcMaterialFromSlot(slot_id_in);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
else
|
|
||||||
*/
|
|
||||||
|
|
||||||
if (inst->GetOrnamentationIDFile() && inst->GetOrnamentationIcon())
|
if (inst->GetOrnamentationIDFile() && inst->GetOrnamentationIcon())
|
||||||
{
|
{
|
||||||
@ -4896,8 +4877,6 @@ namespace RoF
|
|||||||
|
|
||||||
RoF::structs::ItemSerializationHeaderFinish hdrf;
|
RoF::structs::ItemSerializationHeaderFinish hdrf;
|
||||||
hdrf.ornamentIcon = ornaIcon;
|
hdrf.ornamentIcon = ornaIcon;
|
||||||
hdrf.unknown061 = 0;
|
|
||||||
hdrf.unknown062 = 0;
|
|
||||||
hdrf.unknowna1 = 0xffffffff;
|
hdrf.unknowna1 = 0xffffffff;
|
||||||
hdrf.ornamentHeroModel = heroModel;
|
hdrf.ornamentHeroModel = heroModel;
|
||||||
hdrf.unknown063 = 0;
|
hdrf.unknown063 = 0;
|
||||||
|
|||||||
@ -4877,27 +4877,8 @@ namespace RoF2
|
|||||||
ss.write((const char*)&evotop, sizeof(RoF2::structs::EvolvingItem));
|
ss.write((const char*)&evotop, sizeof(RoF2::structs::EvolvingItem));
|
||||||
}
|
}
|
||||||
//ORNAMENT IDFILE / ICON
|
//ORNAMENT IDFILE / ICON
|
||||||
uint16 ornaIcon = 0;
|
uint32 ornaIcon = 0;
|
||||||
int32 heroModel = 0;
|
uint32 heroModel = 0;
|
||||||
/*
|
|
||||||
if (inst->GetOrnamentationAug(ornamentationAugtype))
|
|
||||||
{
|
|
||||||
const Item_Struct *aug_weap = inst->GetOrnamentationAug(ornamentationAugtype)->GetItem();
|
|
||||||
//Mainhand
|
|
||||||
ss.write(aug_weap->IDFile, strlen(aug_weap->IDFile));
|
|
||||||
ss.write((const char*)&null_term, sizeof(uint8));
|
|
||||||
//Offhand
|
|
||||||
ss.write(aug_weap->IDFile, strlen(aug_weap->IDFile));
|
|
||||||
ss.write((const char*)&null_term, sizeof(uint8));
|
|
||||||
//Icon
|
|
||||||
ornaIcon = aug_weap->Icon;
|
|
||||||
if (aug_weap->HerosForgeModel > 0)
|
|
||||||
{
|
|
||||||
heroModel = (aug_weap->HerosForgeModel * 100) + Inventory::CalcMaterialFromSlot(slot_id_in);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
else
|
|
||||||
*/
|
|
||||||
|
|
||||||
if (inst->GetOrnamentationIDFile() && inst->GetOrnamentationIcon())
|
if (inst->GetOrnamentationIDFile() && inst->GetOrnamentationIcon())
|
||||||
{
|
{
|
||||||
@ -4919,8 +4900,6 @@ namespace RoF2
|
|||||||
|
|
||||||
RoF2::structs::ItemSerializationHeaderFinish hdrf;
|
RoF2::structs::ItemSerializationHeaderFinish hdrf;
|
||||||
hdrf.ornamentIcon = ornaIcon;
|
hdrf.ornamentIcon = ornaIcon;
|
||||||
hdrf.unknown061 = 0;
|
|
||||||
hdrf.unknown062 = 0;
|
|
||||||
hdrf.unknowna1 = 0xffffffff;
|
hdrf.unknowna1 = 0xffffffff;
|
||||||
hdrf.ornamentHeroModel = heroModel;
|
hdrf.ornamentHeroModel = heroModel;
|
||||||
hdrf.unknown063 = 0;
|
hdrf.unknown063 = 0;
|
||||||
|
|||||||
@ -4381,9 +4381,7 @@ struct EvolvingItem {
|
|||||||
|
|
||||||
struct ItemSerializationHeaderFinish
|
struct ItemSerializationHeaderFinish
|
||||||
{
|
{
|
||||||
/*079*/ uint16 ornamentIcon;
|
/*079*/ uint32 ornamentIcon;
|
||||||
/*081*/ uint8 unknown061; // 0 - Add Evolving Item struct if this isn't set to 0?
|
|
||||||
/*082*/ uint8 unknown062; // 0
|
|
||||||
/*083*/ int32 unknowna1; // 0xffffffff
|
/*083*/ int32 unknowna1; // 0xffffffff
|
||||||
/*087*/ uint32 ornamentHeroModel; // 0
|
/*087*/ uint32 ornamentHeroModel; // 0
|
||||||
/*091*/ uint8 unknown063; // 0
|
/*091*/ uint8 unknown063; // 0
|
||||||
|
|||||||
@ -4413,9 +4413,7 @@ struct EvolvingItem {
|
|||||||
|
|
||||||
struct ItemSerializationHeaderFinish
|
struct ItemSerializationHeaderFinish
|
||||||
{
|
{
|
||||||
/*079*/ uint16 ornamentIcon;
|
/*079*/ uint32 ornamentIcon;
|
||||||
/*081*/ uint8 unknown061; // 0 - Add Evolving Item struct if this isn't set to 0?
|
|
||||||
/*082*/ uint8 unknown062; // 0
|
|
||||||
/*083*/ int32 unknowna1; // 0xffffffff
|
/*083*/ int32 unknowna1; // 0xffffffff
|
||||||
/*087*/ uint32 ornamentHeroModel; // 0
|
/*087*/ uint32 ornamentHeroModel; // 0
|
||||||
/*091*/ uint8 unknown063; // 0
|
/*091*/ uint8 unknown063; // 0
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user