From db7f0cc9776dd15d83019bf7f9e73595b5226361 Mon Sep 17 00:00:00 2001 From: Uleat Date: Sun, 23 Oct 2016 15:28:20 -0400 Subject: [PATCH] Fix for model glitches resulting from a recent patch --- common/patches/rof.cpp | 4 ++-- common/patches/rof2.cpp | 4 ++-- common/textures.h | 26 +++++--------------------- world/worlddb.cpp | 4 ++-- zone/bot.cpp | 2 +- zone/mob.cpp | 2 +- 6 files changed, 13 insertions(+), 29 deletions(-) diff --git a/common/patches/rof.cpp b/common/patches/rof.cpp index 6d13bb338..5793e6392 100644 --- a/common/patches/rof.cpp +++ b/common/patches/rof.cpp @@ -3063,7 +3063,7 @@ namespace RoF eq_cse->Equip[equip_index].Material = emu_cse->Equip[equip_index].Material; eq_cse->Equip[equip_index].Unknown1 = emu_cse->Equip[equip_index].Unknown1; eq_cse->Equip[equip_index].EliteMaterial = emu_cse->Equip[equip_index].EliteModel; - eq_cse->Equip[equip_index].HeroForgeModel = emu_cse->Equip[equip_index].HeroicModel; + eq_cse->Equip[equip_index].HeroForgeModel = emu_cse->Equip[equip_index].HerosForgeModel; eq_cse->Equip[equip_index].Material2 = emu_cse->Equip[equip_index].Unknown2; eq_cse->Equip[equip_index].Color = emu_cse->Equip[equip_index].Color; } @@ -4109,7 +4109,7 @@ namespace RoF Equipment[k].Material = emu->equipment.Slot[k].Material; Equipment[k].Unknown1 = emu->equipment.Slot[k].Unknown1; Equipment[k].EliteMaterial = emu->equipment.Slot[k].EliteModel; - Equipment[k].HeroForgeModel = emu->equipment.Slot[k].HeroicModel; + Equipment[k].HeroForgeModel = emu->equipment.Slot[k].HerosForgeModel; Equipment[k].Material2 = emu->equipment.Slot[k].Unknown2; } diff --git a/common/patches/rof2.cpp b/common/patches/rof2.cpp index 14fcdc2e6..c19203d8a 100644 --- a/common/patches/rof2.cpp +++ b/common/patches/rof2.cpp @@ -3158,7 +3158,7 @@ namespace RoF2 eq_cse->Equip[equip_index].Material = emu_cse->Equip[equip_index].Material; eq_cse->Equip[equip_index].Unknown1 = emu_cse->Equip[equip_index].Unknown1; eq_cse->Equip[equip_index].EliteMaterial = emu_cse->Equip[equip_index].EliteModel; - eq_cse->Equip[equip_index].HeroForgeModel = emu_cse->Equip[equip_index].HeroicModel; + eq_cse->Equip[equip_index].HeroForgeModel = emu_cse->Equip[equip_index].HerosForgeModel; eq_cse->Equip[equip_index].Material2 = emu_cse->Equip[equip_index].Unknown2; eq_cse->Equip[equip_index].Color = emu_cse->Equip[equip_index].Color; } @@ -4334,7 +4334,7 @@ namespace RoF2 Equipment[k].Material = emu->equipment.Slot[k].Material; Equipment[k].Unknown1 = emu->equipment.Slot[k].Unknown1; Equipment[k].EliteMaterial = emu->equipment.Slot[k].EliteModel; - Equipment[k].HeroForgeModel = emu->equipment.Slot[k].HeroicModel; + Equipment[k].HeroForgeModel = emu->equipment.Slot[k].HerosForgeModel; Equipment[k].Material2 = emu->equipment.Slot[k].Unknown2; } diff --git a/common/textures.h b/common/textures.h index bbf5f71c9..a39f4c007 100644 --- a/common/textures.h +++ b/common/textures.h @@ -58,27 +58,11 @@ namespace EQEmu const int8 LastTintableTexture = tintFeet; struct Texture_Struct { - union { - struct { - struct { - struct { - uint32 _material; - } _1_field; - - uint32 _unknown1; - uint32 _elite_model; - } _3_fields; - - uint32 _heroic_model; - uint32 _unknown2; - } _5_fields; - - uint32 Material; - uint32 Unknown1; - uint32 EliteModel; - uint32 HeroicModel; - uint32 Unknown2; // same as material? - }; + uint32 Material; + uint32 Unknown1; + uint32 EliteModel; + uint32 HerosForgeModel; + uint32 Unknown2; // same as material? }; struct TextureMaterial_Struct { diff --git a/world/worlddb.cpp b/world/worlddb.cpp index 5cac4b648..2955daf50 100644 --- a/world/worlddb.cpp +++ b/world/worlddb.cpp @@ -120,7 +120,7 @@ void WorldDatabase::GetCharSelectInfo(uint32 accountID, EQApplicationPacket **ou cse->Equip[matslot].Material = 0; cse->Equip[matslot].Unknown1 = 0; cse->Equip[matslot].EliteModel = 0; - cse->Equip[matslot].HeroicModel = 0; + cse->Equip[matslot].HerosForgeModel = 0; cse->Equip[matslot].Unknown2 = 0; cse->Equip[matslot].Color = 0; } @@ -288,7 +288,7 @@ void WorldDatabase::GetCharSelectInfo(uint32 accountID, EQApplicationPacket **ou // Armor Materials/Models cse->Equip[matslot].Material = item->Material; cse->Equip[matslot].EliteModel = item->EliteMaterial; - cse->Equip[matslot].HeroicModel = inst->GetOrnamentHeroModel(matslot); + cse->Equip[matslot].HerosForgeModel = inst->GetOrnamentHeroModel(matslot); cse->Equip[matslot].Color = color; } } diff --git a/zone/bot.cpp b/zone/bot.cpp index 1629580bf..133932df7 100644 --- a/zone/bot.cpp +++ b/zone/bot.cpp @@ -2963,7 +2963,7 @@ void Bot::FillSpawnStruct(NewSpawn_Struct* ns, Mob* ForWho) { if (item != 0) { ns->spawn.equipment.Slot[i].Material = item->Material; ns->spawn.equipment.Slot[i].EliteModel = item->EliteMaterial; - ns->spawn.equipment.Slot[i].HeroicModel = item->HerosForgeModel; + ns->spawn.equipment.Slot[i].HerosForgeModel = item->HerosForgeModel; if (armor_tint.Slot[i].Color) ns->spawn.equipment_tint.Slot[i].Color = armor_tint.Slot[i].Color; else diff --git a/zone/mob.cpp b/zone/mob.cpp index 368d34e1f..fbc82e63f 100644 --- a/zone/mob.cpp +++ b/zone/mob.cpp @@ -1159,7 +1159,7 @@ void Mob::FillSpawnStruct(NewSpawn_Struct* ns, Mob* ForWho) { ns->spawn.equipment.Slot[i].Material = GetEquipmentMaterial(i); ns->spawn.equipment.Slot[i].EliteModel = IsEliteMaterialItem(i); - ns->spawn.equipment.Slot[i].HeroicModel = GetHerosForgeModel(i); + ns->spawn.equipment.Slot[i].HerosForgeModel = GetHerosForgeModel(i); ns->spawn.equipment_tint.Slot[i].Color = GetEquipmentColor(i); } }