Better the second time around...

This commit is contained in:
Uleat
2016-06-02 07:14:54 -04:00
parent ca0b26f89f
commit 62888170b0
13 changed files with 44 additions and 68 deletions
+12 -12
View File
@@ -118,12 +118,12 @@ void WorldDatabase::GetCharSelectInfo(uint32 accountID, EQApplicationPacket **ou
cse->Face = (uint8)atoi(row[15]);
for (uint32 matslot = 0; matslot < EQEmu::textures::TextureCount; matslot++) { // Processed below
cse->Equip[matslot].Textures.Material = 0;
cse->Equip[matslot].Textures.Unknown1 = 0;
cse->Equip[matslot].Textures.EliteMaterial = 0;
cse->Equip[matslot].Textures.HeroForgeModel = 0;
cse->Equip[matslot].Textures.Material2 = 0;
cse->Equip[matslot].Color.Color = 0;
cse->Equip[matslot].Material = 0;
cse->Equip[matslot].Unknown1 = 0;
cse->Equip[matslot].EliteMaterial = 0;
cse->Equip[matslot].HeroForgeModel = 0;
cse->Equip[matslot].Material2 = 0;
cse->Equip[matslot].Color = 0;
}
cse->Unknown15 = 0xFF;
@@ -262,12 +262,12 @@ void WorldDatabase::GetCharSelectInfo(uint32 accountID, EQApplicationPacket **ou
// Weapon Models
if (inst->GetOrnamentationIDFile() != 0) {
idfile = inst->GetOrnamentationIDFile();
cse->Equip[matslot].Textures.Material = idfile;
cse->Equip[matslot].Material = idfile;
}
else {
if (strlen(item->IDFile) > 2) {
idfile = atoi(&item->IDFile[2]);
cse->Equip[matslot].Textures.Material = idfile;
cse->Equip[matslot].Material = idfile;
}
}
if (matslot == EQEmu::textures::TexturePrimary) {
@@ -287,10 +287,10 @@ void WorldDatabase::GetCharSelectInfo(uint32 accountID, EQApplicationPacket **ou
}
// Armor Materials/Models
cse->Equip[matslot].Textures.Material = item->Material;
cse->Equip[matslot].Textures.EliteMaterial = item->EliteMaterial;
cse->Equip[matslot].Textures.HeroForgeModel = inst->GetOrnamentHeroModel(matslot);
cse->Equip[matslot].Color.Color = color;
cse->Equip[matslot].Material = item->Material;
cse->Equip[matslot].EliteMaterial = item->EliteMaterial;
cse->Equip[matslot].HeroForgeModel = inst->GetOrnamentHeroModel(matslot);
cse->Equip[matslot].Color = color;
}
}
}