Khaganat-NeL/khanat-opennel-code
2
0
Fork 0
Code Issues 21 Pull requests Projects Releases 1 Packages Wiki Activity

Changed: Some improvements (only try to fix wrong filenames if right files don't exist)

Browse source
This commit is contained in:
kervala 2015-12-20 19:06:38 +01:00
parent 732398c69e
commit 48aefa0f17
2 changed files with 54 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -458,8 +458,15 @@ void SCharacter3DSetup::setupFromCS_ModelCol (SLOTTYPE::EVisualSlot s, sint32 mo
tmpName.replace(posBottes+7, 0, "_" + orgType);
tmpName.replace(7, orgType.length(), "caster01");
// temporary hack because Fyros boots don't respect conventions
if (tmpName[0] == 'f')
if (CPath::exists(tmpName))
{
// use fixed shape name only if file is present
Parts[part].Name = tmpName;
}
else
{
// temporary hack because Fyros light boots don't respect conventions
if (tmpName[0] == 'f' && (item->ItemType == ITEM_TYPE::LIGHT_BOOTS))
{
if (tmpName[5] == 'f')
{
@ -469,7 +476,6 @@ void SCharacter3DSetup::setupFromCS_ModelCol (SLOTTYPE::EVisualSlot s, sint32 mo
{
tmpName = "fy_hom_caster01_civil01_bottes.shape";
}
}
// use fixed shape name only if file is present
if (CPath::exists(tmpName))
@ -481,6 +487,12 @@ void SCharacter3DSetup::setupFromCS_ModelCol (SLOTTYPE::EVisualSlot s, sint32 mo
nlwarning("File %s doesn't exist, use %s", tmpName.c_str(), Parts[part].Name.c_str());
}
}
else
{
nlwarning("File %s doesn't exist, use %s", tmpName.c_str(), Parts[part].Name.c_str());
}
}
}
}
}

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

@ -569,8 +569,15 @@ void CPlayerCL::equip(SLOTTYPE::EVisualSlot slot, uint index, uint color)
tmpName.replace(posBottes+7, 0, "_" + orgType);
tmpName.replace(7, orgType.length(), "caster01");
// temporary hack because Fyros boots don't respect conventions
if (tmpName[0] == 'f')
if (CPath::exists(tmpName))
{
// use fixed shape name only if file is present
shapeName = tmpName;
}
else
{
// temporary hack because Fyros light boots don't respect conventions
if (tmpName[0] == 'f' && (item->ItemType == ITEM_TYPE::LIGHT_BOOTS))
{
if (tmpName[5] == 'f')
{
@ -580,7 +587,6 @@ void CPlayerCL::equip(SLOTTYPE::EVisualSlot slot, uint index, uint color)
{
tmpName = "fy_hom_caster01_civil01_bottes.shape";
}
}
// use fixed shape name only if file is present
if (CPath::exists(tmpName))
@ -592,6 +598,12 @@ void CPlayerCL::equip(SLOTTYPE::EVisualSlot slot, uint index, uint color)
nlwarning("File %s doesn't exist, use %s", tmpName.c_str(), shapeName.c_str());
}
}
else
{
nlwarning("File %s doesn't exist, use %s", tmpName.c_str(), shapeName.c_str());
}
}
}
}
}