aleajactaest/khanat-code-old
1
0
Fork 0
mirror of https://port.numenaute.org/aleajactaest/khanat-code-old.git synced 2024-11-27 01:06:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge with develop

Browse source
This commit is contained in:
kervala 2016-01-30 20:45:19 +01:00
parent 3324471931
commit 3e51da6264
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) FOREACH(itBot, vector<CBot*>, bots)
{ {
CBot* bot = *itBot; 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) float CStateInstance::getNelVar(std::string const& varId)
{ {
TNelVarList::iterator it = _NelVar.find(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)) if (NLMISC::CVariable<float>::exists(varId))
{ {