pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-06-11 03:31:08 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

[Hotfix] Illusion Revert (#1398)

Browse Source 
* Revert some "fixes", clean some code up

* Use RaceGender default height data for when calculating size during SendIllusionPacket which should alleviate some inconsistencies for new clients zoning in and seeing the entity

* Some code cleanup
This commit is contained in:
Chris Miles
2021-06-13 18:06:27 -05:00
committed by GitHub
parent e1e5873398
commit 8d90b5a2e7
4 changed files with 103 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files
zone/mob.cpp
+55 -51
View File
@@ -1811,23 +1811,25 @@ void Mob::SendIllusionPacket(
new_drakkin_details = (in_drakkin_details == 0xFFFFFFFF) ? GetDrakkinDetails() : in_drakkin_details;
new_aa_title = in_aa_title;
// Reset features to Base from the Player Profile
if (IsClient() && in_race == 0) {
race = CastToClient()->GetBaseRace();
gender = CastToClient()->GetBaseGender();
bool reset_features_to_player_profile = IsClient() && in_race == 0;
if (reset_features_to_player_profile) {
auto c = CastToClient();
race = c->GetBaseRace();
gender = c->GetBaseGender();
new_texture = texture = 0xFF;
new_helmtexture = helmtexture = 0xFF;
new_haircolor = haircolor = CastToClient()->GetBaseHairColor();
new_beardcolor = beardcolor = CastToClient()->GetBaseBeardColor();
new_eyecolor1 = eyecolor1 = CastToClient()->GetBaseEyeColor();
new_eyecolor2 = eyecolor2 = CastToClient()->GetBaseEyeColor();
new_hairstyle = hairstyle = CastToClient()->GetBaseHairStyle();
new_luclinface = luclinface = CastToClient()->GetBaseFace();
new_beard = beard = CastToClient()->GetBaseBeard();
new_haircolor = haircolor = c->GetBaseHairColor();
new_beardcolor = beardcolor = c->GetBaseBeardColor();
new_eyecolor1 = eyecolor1 = c->GetBaseEyeColor();
new_eyecolor2 = eyecolor2 = c->GetBaseEyeColor();
new_hairstyle = hairstyle = c->GetBaseHairStyle();
new_luclinface = luclinface = c->GetBaseFace();
new_beard = beard = c->GetBaseBeard();
new_aa_title = aa_title = 0xFF;
new_drakkin_heritage = drakkin_heritage = CastToClient()->GetBaseHeritage();
new_drakkin_tattoo = drakkin_tattoo = CastToClient()->GetBaseTattoo();
new_drakkin_details = drakkin_details = CastToClient()->GetBaseDetails();
new_drakkin_heritage = drakkin_heritage = c->GetBaseHeritage();
new_drakkin_tattoo = drakkin_tattoo = c->GetBaseTattoo();
new_drakkin_details = drakkin_details = c->GetBaseDetails();
switch (race) {
case OGRE:
size = 9;
@@ -1858,50 +1860,52 @@ void Mob::SendIllusionPacket(
}
}
// update internal values for mob
// TODO: Move this to its own SetIllusion function later
// size = (in_size <= 0.0f) ? GetSize() : in_size;
// texture = new_texture;
// helmtexture = new_helmtexture;
// haircolor = new_haircolor;
// beardcolor = new_beardcolor;
// eyecolor1 = new_eyecolor1;
// eyecolor2 = new_eyecolor2;
// hairstyle = new_hairstyle;
// luclinface = new_luclinface;
// beard = new_beard;
// drakkin_heritage = new_drakkin_heritage;
// drakkin_tattoo = new_drakkin_tattoo;
// drakkin_details = new_drakkin_details;
// update internal values for mob from illusion
size = (in_size <= 0.0f) ? GetRaceGenderDefaultHeight(race, gender) : in_size;
texture = new_texture;
helmtexture = new_helmtexture;
haircolor = new_haircolor;
beardcolor = new_beardcolor;
eyecolor1 = new_eyecolor1;
eyecolor2 = new_eyecolor2;
hairstyle = new_hairstyle;
luclinface = new_luclinface;
beard = new_beard;
drakkin_heritage = new_drakkin_heritage;
drakkin_tattoo = new_drakkin_tattoo;
drakkin_details = new_drakkin_details;
auto outapp = new EQApplicationPacket(OP_Illusion, sizeof(Illusion_Struct));
Illusion_Struct *is = (Illusion_Struct *) outapp->pBuffer;
is->spawnid = GetID();
strcpy(is->charname, GetCleanName());
is->race = race;
is->gender = gender;
is->texture = new_texture;
is->helmtexture = new_helmtexture;
is->haircolor = new_haircolor;
is->beardcolor = new_beardcolor;
is->beard = new_beard;
is->eyecolor1 = new_eyecolor1;
is->eyecolor2 = new_eyecolor2;
is->hairstyle = new_hairstyle;
is->face = new_luclinface;
is->drakkin_heritage = new_drakkin_heritage;
is->drakkin_tattoo = new_drakkin_tattoo;
is->drakkin_details = new_drakkin_details;
is->size = size;
// send packet
auto outapp = new EQApplicationPacket(OP_Illusion, sizeof(Illusion_Struct));
auto *i = (Illusion_Struct *) outapp->pBuffer;
i->spawnid = GetID();
strcpy(i->charname, GetCleanName());
i->race = race;
i->gender = gender;
i->texture = new_texture;
i->helmtexture = new_helmtexture;
i->haircolor = new_haircolor;
i->beardcolor = new_beardcolor;
i->beard = new_beard;
i->eyecolor1 = new_eyecolor1;
i->eyecolor2 = new_eyecolor2;
i->hairstyle = new_hairstyle;
i->face = new_luclinface;
i->drakkin_heritage = new_drakkin_heritage;
i->drakkin_tattoo = new_drakkin_tattoo;
i->drakkin_details = new_drakkin_details;
i->size = size;
entity_list.QueueClients(this, outapp);
safe_delete(outapp);
/* Refresh armor and tints after send illusion packet */
// Refresh armor and tints after send illusion packet
SendArmorAppearance();
LogSpells(
"Illusion: Race [{}] Gender [{}] Texture [{}] HelmTexture [{}] HairColor [{}] BeardColor [{}] EyeColor1 [{}] EyeColor2 [{}] HairStyle [{}] Face [{}] DrakkinHeritage [{}] DrakkinTattoo [{}] DrakkinDetails [{}] Size [{}]",
LogMobAppearance(
"[SendIllusionPacket] race [{}] gender [{}] new_texture [{}] new_helmtexture [{}] new_haircolor [{}] new_beardcolor [{}] "
"new_eyecolor1 [{}] new_eyecolor2 [{}] new_hairstyle [{}] new_luclinface [{}] new_drakkin_heritage [{}] "
"new_drakkin_tattoo [{}] new_drakkin_details [{}] size [{}]",
race,
gender,
new_texture,