pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-05-16 18:52:22 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Implementation clean-up

Browse Source
This commit is contained in:
Uleat
2016-06-01 09:34:16 -04:00
parent cd8cd90a38
commit ca0b26f89f
7 changed files with 31 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
common/patches/rof.cpp
+8 -8
View File
@@ -2068,7 +2068,7 @@ namespace RoF
outapp->WriteUInt32(22); // Equipment count
for (int r = 0; r < 9; r++)
for (int r = EQEmu::textures::TextureBegin; r < EQEmu::textures::TextureCount; r++)
{
outapp->WriteUInt32(emu->item_material.Slot[r].Material);
outapp->WriteUInt32(0);
@@ -2088,9 +2088,9 @@ namespace RoF
outapp->WriteUInt32(0);
}
outapp->WriteUInt32(9); // Equipment2 count
outapp->WriteUInt32(EQEmu::textures::TextureCount); // Equipment2 count
for (int r = 0; r < 9; r++)
for (int r = EQEmu::textures::TextureBegin; r < EQEmu::textures::TextureCount; r++)
{
outapp->WriteUInt32(0);
outapp->WriteUInt32(0);
@@ -2099,7 +2099,7 @@ namespace RoF
outapp->WriteUInt32(0);
}
outapp->WriteUInt32(9); // Tint Count
outapp->WriteUInt32(EQEmu::textures::TextureCount); // Tint Count
for (int r = 0; r < 7; r++)
{
@@ -2109,7 +2109,7 @@ namespace RoF
outapp->WriteUInt32(0);
outapp->WriteUInt32(0);
outapp->WriteUInt32(9); // Tint2 Count
outapp->WriteUInt32(EQEmu::textures::TextureCount); // Tint2 Count
for (int r = 0; r < 7; r++)
{
@@ -4083,7 +4083,7 @@ namespace RoF
if ((emu->NPC == 0) || (emu->race <= 12) || (emu->race == 128) || (emu->race == 130) || (emu->race == 330) || (emu->race == 522))
{
for (k = 0; k < 9; ++k)
for (k = EQEmu::textures::TextureBegin; k < EQEmu::textures::TextureCount; ++k)
{
{
VARSTRUCT_ENCODE_TYPE(uint32, Buffer, emu->equipment_tint.Slot[k].Color);
@@ -4092,7 +4092,7 @@ namespace RoF
structs::Texture_Struct *Equipment = (structs::Texture_Struct *)Buffer;
for (k = 0; k < 9; k++) {
for (k = EQEmu::textures::TextureBegin; k < EQEmu::textures::TextureCount; k++) {
Equipment[k].Material = emu->equipment.Slot[k].Material;
Equipment[k].Unknown1 = emu->equipment.Slot[k].Unknown1;
Equipment[k].EliteMaterial = emu->equipment.Slot[k].EliteMaterial;
@@ -4100,7 +4100,7 @@ namespace RoF
Equipment[k].Material2 = emu->equipment.Slot[k].Material2;
}
Buffer += (sizeof(structs::Texture_Struct) * 9);
Buffer += (sizeof(structs::Texture_Struct) * EQEmu::textures::TextureCount);
}
else
{
common/patches/rof2.cpp
+8 -8
View File
@@ -2152,7 +2152,7 @@ namespace RoF2
outapp->WriteUInt32(22); // Equipment count
for (int r = 0; r < 9; r++)
for (int r = EQEmu::textures::TextureBegin; r < EQEmu::textures::TextureCount; r++)
{
outapp->WriteUInt32(emu->item_material.Slot[r].Material);
outapp->WriteUInt32(0);
@@ -2172,9 +2172,9 @@ namespace RoF2
outapp->WriteUInt32(0);
}
outapp->WriteUInt32(9); // Equipment2 count
outapp->WriteUInt32(EQEmu::textures::TextureCount); // Equipment2 count
for (int r = 0; r < 9; r++)
for (int r = EQEmu::textures::TextureBegin; r < EQEmu::textures::TextureCount; r++)
{
outapp->WriteUInt32(0);
outapp->WriteUInt32(0);
@@ -2183,7 +2183,7 @@ namespace RoF2
outapp->WriteUInt32(0);
}
outapp->WriteUInt32(9); // Tint Count
outapp->WriteUInt32(EQEmu::textures::TextureCount); // Tint Count
for (int r = 0; r < 7; r++)
{
@@ -2193,7 +2193,7 @@ namespace RoF2
outapp->WriteUInt32(0);
outapp->WriteUInt32(0);
outapp->WriteUInt32(9); // Tint2 Count
outapp->WriteUInt32(EQEmu::textures::TextureCount); // Tint2 Count
for (int r = 0; r < 7; r++)
{
@@ -4306,7 +4306,7 @@ namespace RoF2
if ((emu->NPC == 0) || (emu->race <= 12) || (emu->race == 128) || (emu->race == 130) || (emu->race == 330) || (emu->race == 522))
{
for (k = 0; k < 9; ++k)
for (k = EQEmu::textures::TextureBegin; k < EQEmu::textures::TextureCount; ++k)
{
{
VARSTRUCT_ENCODE_TYPE(uint32, Buffer, emu->equipment_tint.Slot[k].Color);
@@ -4315,7 +4315,7 @@ namespace RoF2
structs::Texture_Struct *Equipment = (structs::Texture_Struct *)Buffer;
for (k = 0; k < 9; k++) {
for (k = EQEmu::textures::TextureBegin; k < EQEmu::textures::TextureCount; k++) {
Equipment[k].Material = emu->equipment.Slot[k].Material;
Equipment[k].Unknown1 = emu->equipment.Slot[k].Unknown1;
Equipment[k].EliteMaterial = emu->equipment.Slot[k].EliteMaterial;
@@ -4323,7 +4323,7 @@ namespace RoF2
Equipment[k].Material2 = emu->equipment.Slot[k].Material2;
}
Buffer += (sizeof(structs::Texture_Struct) * 9);
Buffer += (sizeof(structs::Texture_Struct) * EQEmu::textures::TextureCount);
}
else
{
common/patches/sod.cpp
+5 -5
View File
@@ -1553,7 +1553,7 @@ namespace SoD
OUT(hairstyle);
OUT(beard);
// OUT(unknown00178[10]);
for (r = 0; r < 9; r++) {
for (r = EQEmu::textures::TextureBegin; r < EQEmu::textures::TextureCount; r++) {
eq->equipment.Slot[r].Material = emu->item_material.Slot[r].Material;
eq->equipment.Slot[r].Unknown1 = 0;
eq->equipment.Slot[r].EliteMaterial = 0;
@@ -2563,7 +2563,7 @@ namespace SoD
float SpawnSize = emu->size;
if (!((emu->NPC == 0) || (emu->race <= 12) || (emu->race == 128) || (emu->race == 130) || (emu->race == 330) || (emu->race == 522)))
{
PacketSize -= (sizeof(structs::Texture_Struct) * 9);
PacketSize -= (sizeof(structs::Texture_Struct) * EQEmu::textures::TextureCount);
if (emu->size == 0)
{
@@ -2760,7 +2760,7 @@ namespace SoD
if ((emu->NPC == 0) || (emu->race <= 12) || (emu->race == 128) || (emu->race == 130) || (emu->race == 330) || (emu->race == 522))
{
for (k = 0; k < 9; ++k)
for (k = EQEmu::textures::TextureBegin; k < EQEmu::textures::TextureCount; ++k)
{
{
VARSTRUCT_ENCODE_TYPE(uint32, Buffer, emu->equipment_tint.Slot[k].Color);
@@ -2787,13 +2787,13 @@ namespace SoD
{
structs::Texture_Struct *Equipment = (structs::Texture_Struct *)Buffer;
for (k = 0; k < 9; k++) {
for (k = EQEmu::textures::TextureBegin; k < EQEmu::textures::TextureCount; k++) {
Equipment[k].Material = emu->equipment.Slot[k].Material;
Equipment[k].Unknown1 = emu->equipment.Slot[k].Unknown1;
Equipment[k].EliteMaterial = emu->equipment.Slot[k].EliteMaterial;
}
Buffer += (sizeof(structs::Texture_Struct) * 9);
Buffer += (sizeof(structs::Texture_Struct) * EQEmu::textures::TextureCount);
}
if (strlen(emu->title))
{
common/patches/sof.cpp
+3 -3
View File
@@ -1209,7 +1209,7 @@ namespace SoF
OUT(hairstyle);
OUT(beard);
// OUT(unknown00178[10]);
for (r = 0; r < 9; r++) {
for (r = EQEmu::textures::TextureBegin; r < EQEmu::textures::TextureCount; r++) {
eq->equipment.Slot[r].Material = emu->item_material.Slot[r].Material;
eq->equipment.Slot[r].Unknown1 = 0;
eq->equipment.Slot[r].EliteMaterial = 0;
@@ -2080,7 +2080,7 @@ namespace SoF
eq->deity = emu->deity;
eq->drakkin_heritage = emu->drakkin_heritage;
eq->gender = emu->gender;
for (k = 0; k < 9; k++) {
for (k = EQEmu::textures::TextureBegin; k < EQEmu::textures::TextureCount; k++) {
eq->equipment.Slot[k].Material = emu->equipment.Slot[k].Material;
eq->equipment.Slot[k].Unknown1 = emu->equipment.Slot[k].Unknown1;
eq->equipment.Slot[k].EliteMaterial = emu->equipment.Slot[k].EliteMaterial;
@@ -2146,7 +2146,7 @@ namespace SoF
strcpy(eq->name, emu->name);
eq->petOwnerId = emu->petOwnerId;
eq->pvp = 0; // 0 = non-pvp colored name, 1 = red pvp name
for (k = 0; k < 9; k++) {
for (k = EQEmu::textures::TextureBegin; k < EQEmu::textures::TextureCount; k++) {
eq->equipment_tint.Slot[k].Color = emu->equipment_tint.Slot[k].Color;
}
eq->anon = emu->anon;
common/patches/titanium.cpp
+2 -2
View File
@@ -903,7 +903,7 @@ namespace Titanium
OUT(hairstyle);
OUT(beard);
// OUT(unknown00178[10]);
for (r = 0; r < 9; r++) {
for (r = EQEmu::textures::TextureBegin; r < EQEmu::textures::TextureCount; r++) {
OUT(item_material.Slot[r].Material);
OUT(item_tint.Slot[r].Color);
}
@@ -1599,7 +1599,7 @@ namespace Titanium
eq->petOwnerId = emu->petOwnerId;
eq->guildrank = emu->guildrank;
// eq->unknown0194[3] = emu->unknown0194[3];
for (k = 0; k < 9; k++) {
for (k = EQEmu::textures::TextureBegin; k < EQEmu::textures::TextureCount; k++) {
eq->equipment.Slot[k].Material = emu->equipment.Slot[k].Material;
eq->equipment_tint.Slot[k].Color = emu->equipment_tint.Slot[k].Color;
}
common/patches/uf.cpp
+5 -5
View File
@@ -1806,7 +1806,7 @@ namespace UF
OUT(hairstyle);
OUT(beard);
// OUT(unknown00178[10]);
for (r = 0; r < 9; r++) {
for (r = EQEmu::textures::TextureBegin; r < EQEmu::textures::TextureCount; r++) {
eq->equipment.Slot[r].Material = emu->item_material.Slot[r].Material;
eq->equipment.Slot[r].Unknown1 = 0;
eq->equipment.Slot[r].EliteMaterial = 0;
@@ -2858,7 +2858,7 @@ namespace UF
float SpawnSize = emu->size;
if (!((emu->NPC == 0) || (emu->race <= 12) || (emu->race == 128) || (emu->race == 130) || (emu->race == 330) || (emu->race == 522)))
{
PacketSize -= (sizeof(structs::Texture_Struct) * 9);
PacketSize -= (sizeof(structs::Texture_Struct) * EQEmu::textures::TextureCount);
if (emu->size == 0)
{
@@ -3057,7 +3057,7 @@ namespace UF
if ((emu->NPC == 0) || (emu->race <= 12) || (emu->race == 128) || (emu->race == 130) || (emu->race == 330) || (emu->race == 522))
{
for (k = 0; k < 9; ++k)
for (k = EQEmu::textures::TextureBegin; k < EQEmu::textures::TextureCount; ++k)
{
{
VARSTRUCT_ENCODE_TYPE(uint32, Buffer, emu->equipment_tint.Slot[k].Color);
@@ -3093,7 +3093,7 @@ namespace UF
{
structs::Texture_Struct *Equipment = (structs::Texture_Struct *)Buffer;
for (k = 0; k < 9; k++) {
for (k = EQEmu::textures::TextureBegin; k < EQEmu::textures::TextureCount; k++) {
if (emu->equipment.Slot[k].Material > 99999) {
Equipment[k].Material = 63;
} else {
@@ -3103,7 +3103,7 @@ namespace UF
Equipment[k].EliteMaterial = emu->equipment.Slot[k].EliteMaterial;
}
Buffer += (sizeof(structs::Texture_Struct) * 9);
Buffer += (sizeof(structs::Texture_Struct) * EQEmu::textures::TextureCount);
}
if (strlen(emu->title))
{