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

Changed: Don't need to use CSString

Browse source
This commit is contained in:
kervala 2016-12-04 17:14:47 +01:00
parent bd58acdf86
commit 8f7ab70efe
1 changed files with 26 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
code/ryzom/common/src/game_share/server_animation_module.cpp
View file

@ -1002,30 +1002,38 @@ IPrimitive* CServerAnimationModule::getAction(CObject* action, const std::string
if(param.splitLines(result) ) if(param.splitLines(result) )
{ {
if (result.size() == 0) std::vector<std::string> res;
if (result.empty())
{ {
nlwarning("ERROR: npc_say but no parameters !!! %d in session ", scenarioId.asInt()); nlwarning("ERROR: npc_say but no parameters !!! %u in session ", scenarioId.asInt());
} }
else
{
res.resize(result.size());
if (result.size() >= 1) if (result.size() >= 1)
{ {
NLMISC::CSString name(result[0]); std::string name(result[0]);
if (name.find(":", 0) != string::npos) if (name.find(":", 0) != string::npos)
{ {
result[0] = prefix+result[0]; res[0] = prefix + name;
}
} }
if (result.size() >= 2) if (result.size() >= 2)
result[1] = "DSS_"+toString(scenarioId)+" "+result[1].c_str();
if(result.size()>=3)
{ {
for(uint32 i=2;i<result.size();++i) res[1] = toString("DSS_%u %s", scenarioId.asInt(), result[1].c_str());
for (uint32 i = 2, len = result.size(); i<len; ++i)
{ {
result[i] = prefix + result[i]; res[i] = prefix + result[i];
} }
} }
pAction->addPropertyByName("parameters", new CPropertyStringArray( (std::vector<std::string> &)result )); }
}
pAction->addPropertyByName("parameters", new CPropertyStringArray(res));
} }
} }