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

Changed: Replace strlwr by toLower

Browse source
This commit is contained in:
kervala 2016-01-06 13:05:49 +01:00
parent cf1f3542d5
commit ef7337b511
1 changed files with 8 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
code/ryzom/server/src/input_output_service/parameter_traits.cpp
View file

@ -584,19 +584,17 @@ public:
std::string op1; std::string op1;
if (cond.Property == "name") if (cond.Property == "name")
{ {
op1 = si.SheetName; op1 = NLMISC::toLower(si.SheetName);
} }
else if (cond.Property == "gender") else if (cond.Property == "gender")
{ {
op1 = si.Gender; op1 = NLMISC::toLower(GSGENDER::toString(si.Gender));
} }
else else
{ {
return CParameterTraitsEntity::eval(lang,charInfo, cond); return CParameterTraitsEntity::eval(lang,charInfo, cond);
} }
NLMISC::strlwr(op1);
LOG("SM : (creature) eval condition for property %s [%s] %s [%s]", cond.Property.c_str(), op1.c_str(), OperatorNames[cond.Operator], cond.ReferenceStr.c_str()); LOG("SM : (creature) eval condition for property %s [%s] %s [%s]", cond.Property.c_str(), op1.c_str(), OperatorNames[cond.Operator], cond.ReferenceStr.c_str());
switch(cond.Operator) switch(cond.Operator)
@ -987,7 +985,7 @@ public:
return false; return false;
} }
const CStringManager::TSheetInfo &si = SM->getSheetInfo(sheetId); const CStringManager::TSheetInfo &si = SM->getSheetInfo(sheetId);
op1 = si.SheetName; op1 = NLMISC::toLower(si.SheetName);
} }
else if (cond.Property == "gender") else if (cond.Property == "gender")
{ {
@ -997,15 +995,13 @@ public:
nlwarning("Could not find character info for EId %s to check property %s", EId.toString().c_str(), cond.Property.c_str()); nlwarning("Could not find character info for EId %s to check property %s", EId.toString().c_str(), cond.Property.c_str());
return false; return false;
} }
op1 = GSGENDER::toString(charInfo->getGender()); op1 = NLMISC::toLower(GSGENDER::toString(charInfo->getGender()));
} }
else else
{ {
return CParameterTraitsEntity::eval(lang,charInfo, cond); return CParameterTraitsEntity::eval(lang,charInfo, cond);
} }
NLMISC::strlwr(op1);
LOG("SM : (player) eval condition for property %s [%s] %s [%s]", cond.Property.c_str(), op1.c_str(), OperatorNames[cond.Operator], cond.ReferenceStr.c_str()); LOG("SM : (player) eval condition for property %s [%s] %s [%s]", cond.Property.c_str(), op1.c_str(), OperatorNames[cond.Operator], cond.ReferenceStr.c_str());
switch(cond.Operator) switch(cond.Operator)
@ -1085,14 +1081,14 @@ public:
} }
else if (cond.Property == "role") else if (cond.Property == "role")
{ {
op1 = si.ChatProfile; op1 = NLMISC::toLower(si.ChatProfile);
} }
else if (cond.Property == "title") else if (cond.Property == "title")
{ {
// we need to retrieve the charInfo // we need to retrieve the charInfo
CCharacterInfos *ci = IOS->getCharInfos(EId); CCharacterInfos *ci = IOS->getCharInfos(EId);
if (ci != NULL) if (ci != NULL)
op1 = ci->Title; op1 = NLMISC::toLower(ci->Title);
else else
{ {
nlwarning("No character info for bot %s, can't test property 'title' !", EId.toString().c_str()); nlwarning("No character info for bot %s, can't test property 'title' !", EId.toString().c_str());
@ -1104,8 +1100,6 @@ public:
return CParameterTraitsEntity::eval(lang, charInfo, cond); return CParameterTraitsEntity::eval(lang, charInfo, cond);
} }
NLMISC::strlwr(op1);
LOG("SM : (bot) eval condition for property %s [%s] %s [%s]", cond.Property.c_str(), op1.c_str(), OperatorNames[cond.Operator], cond.ReferenceStr.c_str()); LOG("SM : (bot) eval condition for property %s [%s] %s [%s]", cond.Property.c_str(), op1.c_str(), OperatorNames[cond.Operator], cond.ReferenceStr.c_str());
switch(cond.Operator) switch(cond.Operator)
@ -1460,18 +1454,17 @@ public:
// check if checked property is gender or name // check if checked property is gender or name
if (cond.Property == "gender") if (cond.Property == "gender")
{ {
value = GSGENDER::toString(charInfo->getGender()); value = NLMISC::toLower(GSGENDER::toString(charInfo->getGender()));
} }
else if (cond.Property == "name") else if (cond.Property == "name")
{ {
value = charInfo->ShortName.toString(); value = NLMISC::toLower(charInfo->ShortName.toString());
} }
else else
{ {
return CParameterTraitsEntity::eval(lang,charInfo, cond); return CParameterTraitsEntity::eval(lang,charInfo, cond);
} }
NLMISC::strlwr(value);
LOG("SM : (self) eval condition for property %s [%s] %s [%s]", cond.Property.c_str(), value.c_str(), OperatorNames[cond.Operator], cond.ReferenceStr.c_str()); LOG("SM : (self) eval condition for property %s [%s] %s [%s]", cond.Property.c_str(), value.c_str(), OperatorNames[cond.Operator], cond.ReferenceStr.c_str());
switch(cond.Operator) switch(cond.Operator)