From ca0b26f89f1fcf34e498975e8366f4ae8f3b917c Mon Sep 17 00:00:00 2001 From: Uleat Date: Wed, 1 Jun 2016 09:34:16 -0400 Subject: [PATCH] Implementation clean-up --- common/patches/rof.cpp | 16 ++++++++-------- common/patches/rof2.cpp | 16 ++++++++-------- common/patches/sod.cpp | 10 +++++----- common/patches/sof.cpp | 6 +++--- common/patches/titanium.cpp | 4 ++-- common/patches/uf.cpp | 10 +++++----- zone/corpse.cpp | 6 ------ 7 files changed, 31 insertions(+), 37 deletions(-) diff --git a/common/patches/rof.cpp b/common/patches/rof.cpp index 61c9c1105..3b1e890bc 100644 --- a/common/patches/rof.cpp +++ b/common/patches/rof.cpp @@ -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 { diff --git a/common/patches/rof2.cpp b/common/patches/rof2.cpp index 0638b4ad3..5011cacb0 100644 --- a/common/patches/rof2.cpp +++ b/common/patches/rof2.cpp @@ -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 { diff --git a/common/patches/sod.cpp b/common/patches/sod.cpp index 916333041..fd99fa0e9 100644 --- a/common/patches/sod.cpp +++ b/common/patches/sod.cpp @@ -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)) { diff --git a/common/patches/sof.cpp b/common/patches/sof.cpp index 7944605f4..38e004cac 100644 --- a/common/patches/sof.cpp +++ b/common/patches/sof.cpp @@ -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; diff --git a/common/patches/titanium.cpp b/common/patches/titanium.cpp index 2f971de8a..17112cf68 100644 --- a/common/patches/titanium.cpp +++ b/common/patches/titanium.cpp @@ -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; } diff --git a/common/patches/uf.cpp b/common/patches/uf.cpp index 66bc0b777..0a720ea2e 100644 --- a/common/patches/uf.cpp +++ b/common/patches/uf.cpp @@ -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)) { diff --git a/zone/corpse.cpp b/zone/corpse.cpp index 98fd4923f..ef948350a 100644 --- a/zone/corpse.cpp +++ b/zone/corpse.cpp @@ -162,8 +162,6 @@ Corpse::Corpse(NPC* in_npc, ItemList* in_itemlist, uint32 in_npctypeid, const NP { corpse_graveyard_timer.Disable(); - //memset(item_tint, 0, sizeof(item_tint)); - is_corpse_changed = false; is_player_corpse = false; is_locked = false; @@ -277,8 +275,6 @@ Corpse::Corpse(Client* client, int32 in_rezexp) : Mob ( corpse_graveyard_timer.Disable(); } - //memset(item_tint, 0, sizeof(item_tint)); - for (i = 0; i < MAX_LOOTERS; i++){ allowed_looters[i] = 0; } @@ -502,8 +498,6 @@ EQEmu::TintProfile(), if (!zone->HasGraveyard() || wasAtGraveyard) corpse_graveyard_timer.Disable(); - //memset(item_tint, 0, sizeof(item_tint)); - is_corpse_changed = false; is_player_corpse = true; is_locked = false;