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

Fixed: Warning multichars

Browse source
This commit is contained in:
kervala 2015-02-14 17:54:05 +01:00
parent 4ee76e6182
commit 9a97ffb211
1 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -45,20 +45,20 @@ void CHairSet::init (NLMISC::IProgressCallback &progress)
progress.progress ((float)k/(float)numHairItem); progress.progress ((float)k/(float)numHairItem);
const CItemSheet *item = SheetMngr.getItem(SLOTTYPE::HEAD_SLOT, k); const CItemSheet *item = SheetMngr.getItem(SLOTTYPE::HEAD_SLOT, k);
if( (item) && (!item->getShape().empty()) ) if (item && !item->getShape().empty())
{ {
std::string itemName = NLMISC::toLower(item->getShape());
if (item->getShape().find("cheveux", 0) != std::string::npos) if (item->getShape().find("cheveux", 0) != std::string::npos)
{ {
// get race // get race
uint16 race = (uint16) itemName[1] | ((uint16) itemName[0] << 8); std::string itemName = NLMISC::toLower(item->getShape());
switch(race)
// fortunately, first character of each race is distinct
switch(itemName[0])
{ {
case 'ma': _Hairs[Matis].push_back(k); break; case 'm': _Hairs[Matis].push_back(k); break;
case 'tr': _Hairs[Tryker].push_back(k); break; case 't': _Hairs[Tryker].push_back(k); break;
case 'zo': _Hairs[Zorai].push_back(k); break; case 'z': _Hairs[Zorai].push_back(k); break;
case 'fy': _Hairs[Fyros].push_back(k); break; case 'f': _Hairs[Fyros].push_back(k); break;
} }
} }
} }