aleajactaest/khanat-opennel-code
1
0
Fork 0
mirror of https://port.numenaute.org/aleajactaest/khanat-opennel-code.git synced 2024-11-27 01:26:30 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed: Use white color for underwears everywhere (even if it's a bug in EGS...)

Browse source 
Changed: Don't call applyColorSlot twice if item exists

--HG--
branch : develop
This commit is contained in:
kervala 2015-12-20 11:12:01 +01:00
parent f51b33cc3b
commit d67d831afe
2 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
code/ryzom/client/src/interface_v3/character_3d.cpp
View file

@ -508,6 +508,9 @@ void SCharacter3DSetup::setupFromCS_ModelCol (SLOTTYPE::EVisualSlot s, sint32 mo
} }
else else
{ {
// fix underwears color
if (model == 0) col = 6; // white
if ((part == Char3DPart_HandLeftItem) || (part == Char3DPart_HandRightItem)) if ((part == Char3DPart_HandLeftItem) || (part == Char3DPart_HandRightItem))
Parts[part].Name = "none.shape"; Parts[part].Name = "none.shape";
} }

4
code/ryzom/client/src/player_cl.cpp
View file

@ -525,8 +525,8 @@ void CPlayerCL::equip(SLOTTYPE::EVisualSlot slot, const std::string &shapeName,
else else
nlwarning("PL::equip(1):%d: cannot create the instance '%s'.", _Slot, shapeName.c_str()); nlwarning("PL::equip(1):%d: cannot create the instance '%s'.", _Slot, shapeName.c_str());
if ((slot != SLOTTYPE::RIGHT_HAND_SLOT) && (slot != SLOTTYPE::LEFT_HAND_SLOT)) if (!item && (slot != SLOTTYPE::RIGHT_HAND_SLOT) && (slot != SLOTTYPE::LEFT_HAND_SLOT))
applyColorSlot(_Instances[s], skin(), 0, _HairColor, _EyesColor); applyColorSlot(_Instances[s], skin(), 6, _HairColor, _EyesColor);
}// equip // }// equip //