From 3bb816ad1dd44042046392f152648a9fc4235be7 Mon Sep 17 00:00:00 2001
From: Trevius <weissres@gmail.com>
Date: Tue, 23 Dec 2014 23:18:59 -0600
Subject: [PATCH] Clean up of RoF+ Item Packets.

---
 common/patches/rof.cpp        | 25 ++-----------------------
 common/patches/rof2.cpp       | 27 +++------------------------
 common/patches/rof2_structs.h |  4 +---
 common/patches/rof_structs.h  |  4 +---
 4 files changed, 7 insertions(+), 53 deletions(-)

diff --git a/common/patches/rof.cpp b/common/patches/rof.cpp
index 71e462ba3..148c9662b 100644
--- a/common/patches/rof.cpp
+++ b/common/patches/rof.cpp
@@ -4854,27 +4854,8 @@ namespace RoF
 			ss.write((const char*)&evotop, sizeof(RoF::structs::EvolvingItem));
 		}
 		//ORNAMENT IDFILE / ICON
-		uint16 ornaIcon = 0;
-		int32 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 
-		*/
+		uint32 ornaIcon = 0;
+		uint32 heroModel = 0;
 
 		if (inst->GetOrnamentationIDFile() && inst->GetOrnamentationIcon())
 		{
@@ -4896,8 +4877,6 @@ namespace RoF
 
 		RoF::structs::ItemSerializationHeaderFinish hdrf;
 		hdrf.ornamentIcon = ornaIcon;
-		hdrf.unknown061 = 0;
-		hdrf.unknown062 = 0;
 		hdrf.unknowna1 = 0xffffffff;
 		hdrf.ornamentHeroModel = heroModel;
 		hdrf.unknown063 = 0;
diff --git a/common/patches/rof2.cpp b/common/patches/rof2.cpp
index 355a23383..8a998b94a 100644
--- a/common/patches/rof2.cpp
+++ b/common/patches/rof2.cpp
@@ -4877,28 +4877,9 @@ namespace RoF2
 			ss.write((const char*)&evotop, sizeof(RoF2::structs::EvolvingItem));
 		}
 		//ORNAMENT IDFILE / ICON
-		uint16 ornaIcon = 0;
-		int32 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 
-		*/
-			
+		uint32 ornaIcon = 0;
+		uint32 heroModel = 0;
+
 		if (inst->GetOrnamentationIDFile() && inst->GetOrnamentationIcon())
 		{
 			char tmp[30]; memset(tmp, 0x0, 30); sprintf(tmp, "IT%d", inst->GetOrnamentationIDFile());
@@ -4919,8 +4900,6 @@ namespace RoF2
 
 		RoF2::structs::ItemSerializationHeaderFinish hdrf;
 		hdrf.ornamentIcon = ornaIcon;
-		hdrf.unknown061 = 0;
-		hdrf.unknown062 = 0;
 		hdrf.unknowna1 = 0xffffffff;
 		hdrf.ornamentHeroModel = heroModel;
 		hdrf.unknown063 = 0;
diff --git a/common/patches/rof2_structs.h b/common/patches/rof2_structs.h
index f7a2844b1..a9011c4d7 100644
--- a/common/patches/rof2_structs.h
+++ b/common/patches/rof2_structs.h
@@ -4381,9 +4381,7 @@ struct EvolvingItem {
 
 struct ItemSerializationHeaderFinish
 {
-/*079*/	uint16 ornamentIcon;
-/*081*/	uint8 unknown061;	// 0 - Add Evolving Item struct if this isn't set to 0?
-/*082*/	uint8 unknown062;	// 0
+/*079*/	uint32 ornamentIcon;
 /*083*/	int32 unknowna1;	// 0xffffffff
 /*087*/	uint32 ornamentHeroModel;	// 0
 /*091*/	uint8 unknown063;	// 0
diff --git a/common/patches/rof_structs.h b/common/patches/rof_structs.h
index 787a4b786..fb2f09615 100644
--- a/common/patches/rof_structs.h
+++ b/common/patches/rof_structs.h
@@ -4413,9 +4413,7 @@ struct EvolvingItem {
 
 struct ItemSerializationHeaderFinish
 {
-/*079*/	uint16 ornamentIcon;
-/*081*/	uint8 unknown061;	// 0 - Add Evolving Item struct if this isn't set to 0?
-/*082*/	uint8 unknown062;	// 0
+/*079*/	uint32 ornamentIcon;
 /*083*/	int32 unknowna1;	// 0xffffffff
 /*087*/	uint32 ornamentHeroModel;	// 0
 /*091*/	uint8 unknown063;	// 0