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

Merge with develop

Browse source 
--HG--
branch : compatibility-develop
This commit is contained in:
kervala 2016-01-30 20:45:19 +01:00
commit cf7a1e589f
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
code/ryzom/server/src/ai_service/commands.cpp
View file

@ -1686,7 +1686,9 @@ NLMISC_COMMAND(getDatasetId,"get datasetid of bots with name matchiong the given
FOREACH(itBot, vector<CBot*>, bots)
{
CBot* bot = *itBot;
DatasetIds += bot->getSpawnObj()->dataSetRow().toString()+"|";
CSpawnBot* spawnBot = bot->getSpawnObj();
if (spawnBot!=NULL)
DatasetIds += spawnBot->dataSetRow().toString()+"|";
}
}

2
code/ryzom/server/src/ai_service/state_instance.h
View file

@ -376,7 +376,7 @@ inline
float CStateInstance::getNelVar(std::string const& varId)
{
TNelVarList::iterator it = _NelVar.find(varId);
if (it != _NelVar.end()) return it->second->get()
if (it != _NelVar.end()) return it->second->get();
if (NLMISC::CVariable<float>::exists(varId))
{