Implementation clean-up

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
+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
{