pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2025-12-22 11:11:30 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Better the second time around...

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
common/eq_packet_structs.h
View File

@ -126,11 +126,7 @@ struct LDoNTrapTemplate
// All clients translate the character select information to some degree // All clients translate the character select information to some degree
struct CharSelectEquip struct CharSelectEquip : EQEmu::Texture_Struct, EQEmu::Tint_Struct {};
{
EQEmu::Texture_Struct Textures;
EQEmu::Tint_Struct Color;
};
// RoF2-based hybrid struct // RoF2-based hybrid struct
struct CharacterSelectEntry_Struct struct CharacterSelectEntry_Struct

12
common/patches/rof.cpp
View File

@ -3047,12 +3047,12 @@ namespace RoF
eq_cse->Face = emu_cse->Face; eq_cse->Face = emu_cse->Face;
for (int equip_index = 0; equip_index < EQEmu::textures::TextureCount; equip_index++) { for (int equip_index = 0; equip_index < EQEmu::textures::TextureCount; equip_index++) {
eq_cse->Equip[equip_index].Textures.Material = emu_cse->Equip[equip_index].Textures.Material; eq_cse->Equip[equip_index].Material = emu_cse->Equip[equip_index].Material;
eq_cse->Equip[equip_index].Textures.Unknown1 = emu_cse->Equip[equip_index].Textures.Unknown1; eq_cse->Equip[equip_index].Unknown1 = emu_cse->Equip[equip_index].Unknown1;
eq_cse->Equip[equip_index].Textures.EliteMaterial = emu_cse->Equip[equip_index].Textures.EliteMaterial; eq_cse->Equip[equip_index].EliteMaterial = emu_cse->Equip[equip_index].EliteMaterial;
eq_cse->Equip[equip_index].Textures.HeroForgeModel = emu_cse->Equip[equip_index].Textures.HeroForgeModel; eq_cse->Equip[equip_index].HeroForgeModel = emu_cse->Equip[equip_index].HeroForgeModel;
eq_cse->Equip[equip_index].Textures.Material2 = emu_cse->Equip[equip_index].Textures.Material2; eq_cse->Equip[equip_index].Material2 = emu_cse->Equip[equip_index].Material2;
eq_cse->Equip[equip_index].Color.Color = emu_cse->Equip[equip_index].Color.Color; eq_cse->Equip[equip_index].Color = emu_cse->Equip[equip_index].Color;
} }
eq_cse->Unknown15 = emu_cse->Unknown15; eq_cse->Unknown15 = emu_cse->Unknown15;

12
common/patches/rof2.cpp
View File

@ -3140,12 +3140,12 @@ namespace RoF2
eq_cse->Face = emu_cse->Face; eq_cse->Face = emu_cse->Face;
for (int equip_index = 0; equip_index < EQEmu::textures::TextureCount; equip_index++) { for (int equip_index = 0; equip_index < EQEmu::textures::TextureCount; equip_index++) {
eq_cse->Equip[equip_index].Textures.Material = emu_cse->Equip[equip_index].Textures.Material; eq_cse->Equip[equip_index].Material = emu_cse->Equip[equip_index].Material;
eq_cse->Equip[equip_index].Textures.Unknown1 = emu_cse->Equip[equip_index].Textures.Unknown1; eq_cse->Equip[equip_index].Unknown1 = emu_cse->Equip[equip_index].Unknown1;
eq_cse->Equip[equip_index].Textures.EliteMaterial = emu_cse->Equip[equip_index].Textures.EliteMaterial; eq_cse->Equip[equip_index].EliteMaterial = emu_cse->Equip[equip_index].EliteMaterial;
eq_cse->Equip[equip_index].Textures.HeroForgeModel = emu_cse->Equip[equip_index].Textures.HeroForgeModel; eq_cse->Equip[equip_index].HeroForgeModel = emu_cse->Equip[equip_index].HeroForgeModel;
eq_cse->Equip[equip_index].Textures.Material2 = emu_cse->Equip[equip_index].Textures.Material2; eq_cse->Equip[equip_index].Material2 = emu_cse->Equip[equip_index].Material2;
eq_cse->Equip[equip_index].Color.Color = emu_cse->Equip[equip_index].Color.Color; eq_cse->Equip[equip_index].Color = emu_cse->Equip[equip_index].Color;
} }
eq_cse->Unknown15 = emu_cse->Unknown15; eq_cse->Unknown15 = emu_cse->Unknown15;

6
common/patches/rof2_structs.h
View File

@ -228,11 +228,7 @@ struct Texture_Struct
// TextureProfile(); // TextureProfile();
//}; //};
struct CharSelectEquip struct CharSelectEquip : Texture_Struct, Tint_Struct {};
{
Texture_Struct Textures;
Tint_Struct Color;
};
struct CharacterSelectEntry_Struct struct CharacterSelectEntry_Struct
{ {

6
common/patches/rof_structs.h
View File

@ -228,11 +228,7 @@ struct Texture_Struct
// TextureProfile(); // TextureProfile();
//}; //};
struct CharSelectEquip struct CharSelectEquip : Texture_Struct, Tint_Struct {};
{
Texture_Struct Textures;
Tint_Struct Color;
};
struct CharacterSelectEntry_Struct struct CharacterSelectEntry_Struct
{ {

8
common/patches/sod.cpp
View File

@ -1994,10 +1994,10 @@ namespace SoD
eq_cse->Face = emu_cse->Face; eq_cse->Face = emu_cse->Face;
for (int equip_index = 0; equip_index < EQEmu::textures::TextureCount; equip_index++) { for (int equip_index = 0; equip_index < EQEmu::textures::TextureCount; equip_index++) {
eq_cse->Equip[equip_index].Textures.Material = emu_cse->Equip[equip_index].Textures.Material; eq_cse->Equip[equip_index].Material = emu_cse->Equip[equip_index].Material;
eq_cse->Equip[equip_index].Textures.Unknown1 = emu_cse->Equip[equip_index].Textures.Unknown1; eq_cse->Equip[equip_index].Unknown1 = emu_cse->Equip[equip_index].Unknown1;
eq_cse->Equip[equip_index].Textures.EliteMaterial = emu_cse->Equip[equip_index].Textures.EliteMaterial; eq_cse->Equip[equip_index].EliteMaterial = emu_cse->Equip[equip_index].EliteMaterial;
eq_cse->Equip[equip_index].Color.Color = emu_cse->Equip[equip_index].Color.Color; eq_cse->Equip[equip_index].Color = emu_cse->Equip[equip_index].Color;
} }
eq_cse->PrimaryIDFile = emu_cse->PrimaryIDFile; eq_cse->PrimaryIDFile = emu_cse->PrimaryIDFile;

6
common/patches/sod_structs.h
View File

@ -184,11 +184,7 @@ struct TextureProfile
TextureProfile(); TextureProfile();
}; };
struct CharSelectEquip struct CharSelectEquip : Texture_Struct, Tint_Struct {};
{
Texture_Struct Textures;
Tint_Struct Color;
};
struct CharacterSelectEntry_Struct struct CharacterSelectEntry_Struct
{ {

8
common/patches/sof.cpp
View File

@ -1650,10 +1650,10 @@ namespace SoF
eq_cse->Face = emu_cse->Face; eq_cse->Face = emu_cse->Face;
for (int equip_index = 0; equip_index < EQEmu::textures::TextureCount; equip_index++) { for (int equip_index = 0; equip_index < EQEmu::textures::TextureCount; equip_index++) {
eq_cse->Equip[equip_index].Textures.Material = emu_cse->Equip[equip_index].Textures.Material; eq_cse->Equip[equip_index].Material = emu_cse->Equip[equip_index].Material;
eq_cse->Equip[equip_index].Textures.Unknown1 = emu_cse->Equip[equip_index].Textures.Unknown1; eq_cse->Equip[equip_index].Unknown1 = emu_cse->Equip[equip_index].Unknown1;
eq_cse->Equip[equip_index].Textures.EliteMaterial = emu_cse->Equip[equip_index].Textures.EliteMaterial; eq_cse->Equip[equip_index].EliteMaterial = emu_cse->Equip[equip_index].EliteMaterial;
eq_cse->Equip[equip_index].Color.Color = emu_cse->Equip[equip_index].Color.Color; eq_cse->Equip[equip_index].Color = emu_cse->Equip[equip_index].Color;
} }
eq_cse->PrimaryIDFile = emu_cse->PrimaryIDFile; eq_cse->PrimaryIDFile = emu_cse->PrimaryIDFile;

6
common/patches/sof_structs.h
View File

@ -184,11 +184,7 @@ struct TextureProfile
TextureProfile(); TextureProfile();
}; };
struct CharSelectEquip struct CharSelectEquip : Texture_Struct, Tint_Struct {};
{
Texture_Struct Textures;
Tint_Struct Color;
};
struct CharacterSelectEntry_Struct struct CharacterSelectEntry_Struct
{ {

4
common/patches/titanium.cpp
View File

@ -1224,14 +1224,14 @@ namespace Titanium
eq->Race[char_index] = 1; eq->Race[char_index] = 1;
for (int index = 0; index < EQEmu::textures::TextureCount; ++index) { for (int index = 0; index < EQEmu::textures::TextureCount; ++index) {
eq->CS_Colors[char_index].Slot[index].Color = emu_cse->Equip[index].Color.Color; eq->CS_Colors[char_index].Slot[index].Color = emu_cse->Equip[index].Color;
} }
eq->BeardColor[char_index] = emu_cse->BeardColor; eq->BeardColor[char_index] = emu_cse->BeardColor;
eq->HairStyle[char_index] = emu_cse->HairStyle; eq->HairStyle[char_index] = emu_cse->HairStyle;
for (int index = 0; index < EQEmu::textures::TextureCount; ++index) { for (int index = 0; index < EQEmu::textures::TextureCount; ++index) {
eq->Equip[char_index].Slot[index].Material = emu_cse->Equip[index].Textures.Material; eq->Equip[char_index].Slot[index].Material = emu_cse->Equip[index].Material;
} }
eq->SecondaryIDFile[char_index] = emu_cse->SecondaryIDFile; eq->SecondaryIDFile[char_index] = emu_cse->SecondaryIDFile;

8
common/patches/uf.cpp
View File

@ -2291,10 +2291,10 @@ namespace UF
eq_cse->Face = emu_cse->Face; eq_cse->Face = emu_cse->Face;
for (int equip_index = 0; equip_index < EQEmu::textures::TextureCount; equip_index++) { for (int equip_index = 0; equip_index < EQEmu::textures::TextureCount; equip_index++) {
eq_cse->Equip[equip_index].Textures.Material = emu_cse->Equip[equip_index].Textures.Material; eq_cse->Equip[equip_index].Material = emu_cse->Equip[equip_index].Material;
eq_cse->Equip[equip_index].Textures.Unknown1 = emu_cse->Equip[equip_index].Textures.Unknown1; eq_cse->Equip[equip_index].Unknown1 = emu_cse->Equip[equip_index].Unknown1;
eq_cse->Equip[equip_index].Textures.EliteMaterial = emu_cse->Equip[equip_index].Textures.EliteMaterial; eq_cse->Equip[equip_index].EliteMaterial = emu_cse->Equip[equip_index].EliteMaterial;
eq_cse->Equip[equip_index].Color.Color = emu_cse->Equip[equip_index].Color.Color; eq_cse->Equip[equip_index].Color = emu_cse->Equip[equip_index].Color;
} }
eq_cse->PrimaryIDFile = emu_cse->PrimaryIDFile; eq_cse->PrimaryIDFile = emu_cse->PrimaryIDFile;

6
common/patches/uf_structs.h
View File

@ -184,11 +184,7 @@ struct TextureProfile
TextureProfile(); TextureProfile();
}; };
struct CharSelectEquip struct CharSelectEquip : Texture_Struct, Tint_Struct {};
{
Texture_Struct Textures;
Tint_Struct Color;
};
struct CharacterSelectEntry_Struct struct CharacterSelectEntry_Struct
{ {

24
world/worlddb.cpp
View File

@ -118,12 +118,12 @@ void WorldDatabase::GetCharSelectInfo(uint32 accountID, EQApplicationPacket **ou
cse->Face = (uint8)atoi(row[15]); cse->Face = (uint8)atoi(row[15]);
for (uint32 matslot = 0; matslot < EQEmu::textures::TextureCount; matslot++) { // Processed below for (uint32 matslot = 0; matslot < EQEmu::textures::TextureCount; matslot++) { // Processed below
cse->Equip[matslot].Textures.Material = 0; cse->Equip[matslot].Material = 0;
cse->Equip[matslot].Textures.Unknown1 = 0; cse->Equip[matslot].Unknown1 = 0;
cse->Equip[matslot].Textures.EliteMaterial = 0; cse->Equip[matslot].EliteMaterial = 0;
cse->Equip[matslot].Textures.HeroForgeModel = 0; cse->Equip[matslot].HeroForgeModel = 0;
cse->Equip[matslot].Textures.Material2 = 0; cse->Equip[matslot].Material2 = 0;
cse->Equip[matslot].Color.Color = 0; cse->Equip[matslot].Color = 0;
} }
cse->Unknown15 = 0xFF; cse->Unknown15 = 0xFF;
@ -262,12 +262,12 @@ void WorldDatabase::GetCharSelectInfo(uint32 accountID, EQApplicationPacket **ou
// Weapon Models // Weapon Models
if (inst->GetOrnamentationIDFile() != 0) { if (inst->GetOrnamentationIDFile() != 0) {
idfile = inst->GetOrnamentationIDFile(); idfile = inst->GetOrnamentationIDFile();
cse->Equip[matslot].Textures.Material = idfile; cse->Equip[matslot].Material = idfile;
} }
else { else {
if (strlen(item->IDFile) > 2) { if (strlen(item->IDFile) > 2) {
idfile = atoi(&item->IDFile[2]); idfile = atoi(&item->IDFile[2]);
cse->Equip[matslot].Textures.Material = idfile; cse->Equip[matslot].Material = idfile;
} }
} }
if (matslot == EQEmu::textures::TexturePrimary) { if (matslot == EQEmu::textures::TexturePrimary) {
@ -287,10 +287,10 @@ void WorldDatabase::GetCharSelectInfo(uint32 accountID, EQApplicationPacket **ou
} }
// Armor Materials/Models // Armor Materials/Models
cse->Equip[matslot].Textures.Material = item->Material; cse->Equip[matslot].Material = item->Material;
cse->Equip[matslot].Textures.EliteMaterial = item->EliteMaterial; cse->Equip[matslot].EliteMaterial = item->EliteMaterial;
cse->Equip[matslot].Textures.HeroForgeModel = inst->GetOrnamentHeroModel(matslot); cse->Equip[matslot].HeroForgeModel = inst->GetOrnamentHeroModel(matslot);
cse->Equip[matslot].Color.Color = color; cse->Equip[matslot].Color = color;
} }
} }
} }