diff --git a/ryzom/server/src/ai_service/sheets.cpp b/ryzom/server/src/ai_service/sheets.cpp index 5aae572a1..a1fe61d7a 100644 --- a/ryzom/server/src/ai_service/sheets.cpp +++ b/ryzom/server/src/ai_service/sheets.cpp @@ -971,7 +971,7 @@ uint32 AISHEETS::CSheets::getGroupPropertiesIndex(const std::string &groupIndexN if (groupIndexName.empty()) return std::numeric_limits::max(); - std::map::iterator it = _NameToGroupIndex.find(NLMISC::toUpper(groupIndexName)); + std::map::iterator it = _NameToGroupIndex.find(NLMISC::toUpperAscii(groupIndexName)); if (it==_NameToGroupIndex.end()) { uint32 groupIndex = (uint32)_NameToGroupIndex.size(); diff --git a/ryzom/server/src/entities_game_service/egs_sheets/egs_static_game_sheet.cpp b/ryzom/server/src/entities_game_service/egs_sheets/egs_static_game_sheet.cpp index 4927db680..9bf6fdfe9 100644 --- a/ryzom/server/src/entities_game_service/egs_sheets/egs_static_game_sheet.cpp +++ b/ryzom/server/src/entities_game_service/egs_sheets/egs_static_game_sheet.cpp @@ -1134,14 +1134,14 @@ bool CStaticCreatures::applyUserModel(CCustomElementId userModelId, const std::v splitString(scriptData[i], " ", scriptLine); if (scriptLine.size() < 2 - || toLower(scriptLine[0]) == "protect" && scriptLine.size() < 3) + || toLowerAscii(scriptLine[0]) == "protect" && scriptLine.size() < 3) { nlwarning(" error while reading a script line (uncommented line %i), ignoring it.", i); errors = true; continue; } - switch (attributeMap.find(toLower(scriptLine[0]))) + switch (attributeMap.find(toLowerAscii(scriptLine[0]))) { //FIXME: test attributes value before applying, if error set to default value and errors=true diff --git a/ryzom/server/src/server_share/continent_container.cpp b/ryzom/server/src/server_share/continent_container.cpp index 9babc998b..140fa9bd9 100644 --- a/ryzom/server/src/server_share/continent_container.cpp +++ b/ryzom/server/src/server_share/continent_container.cpp @@ -102,8 +102,8 @@ void CContinentContainer::loadContinent(string name, string file, sint index, bo for (its=_SheetMap.begin(); its!=_SheetMap.end(); ++its) { - if (NLMISC::toLower((*its).second.Name) == NLMISC::toLower(name+".continent") || - NLMISC::toLower((*its).second.PacsRBank) == NLMISC::toLower(name+".rbank")) + if (NLMISC::toLowerAscii((*its).second.Name) == NLMISC::toLowerAscii(name+".continent") || + NLMISC::toLowerAscii((*its).second.PacsRBank) == NLMISC::toLowerAscii(name+".rbank")) { if (found == _SheetMap.end()) { @@ -281,14 +281,14 @@ void CContinentContainer::initPacsPrim(const string &path) for(k=0; k::iterator it(zonePosMap.begin()), end(zonePosMap.end()); it != end; ++it) if (it->second.x >= zonelXMin && it->second.x <= zonelXMax && it->second.y >= zonelYMin && it->second.y <= zonelYMax) - island.Zones.push_back(NLMISC::toUpper(it->first)); + island.Zones.push_back(NLMISC::toUpperAscii(it->first)); } break; }