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 18:02:33 +01:00
commit 782b410eef
1 changed files with 94 additions and 96 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -376,17 +376,16 @@ 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()) if (it != _NelVar.end()) return it->second->get()
{
if (NLMISC::CVariable<float>::exists(varId)) if (NLMISC::CVariable<float>::exists(varId))
{ {
nlwarning("Nel variable \"%s\" exists outside of this state instance", varId.c_str()); nlwarning("Nel variable \"%s\" exists outside of this state instance", varId.c_str());
return 0.f; return 0.f;
} }
_NelVar[varId] = new NLMISC::CVariable<float>("StateInstance", varId.c_str(), "", 0.f); _NelVar[varId] = new NLMISC::CVariable<float>("StateInstance", varId.c_str(), "", 0.f);
_NelVar[varId]->get(); return _NelVar[varId]->get();
}
return it->second->get();
} }
inline inline
@ -424,17 +423,16 @@ inline
std::string CStateInstance::getStrNelVar(std::string const& varId) std::string CStateInstance::getStrNelVar(std::string const& varId)
{ {
TStrNelVarList::iterator it = _StrNelVar.find(varId); TStrNelVarList::iterator it = _StrNelVar.find(varId);
if (it==_StrNelVar.end()) if (it!=_StrNelVar.end()) return it->second->get();
{
if (NLMISC::CVariable<float>::exists(varId)) if (NLMISC::CVariable<float>::exists(varId))
{ {
nlwarning("Nel variable \"%s\" exists outside of this state instance", varId.c_str()); nlwarning("Nel variable \"%s\" exists outside of this state instance", varId.c_str());
return ""; return "";
} }
_StrNelVar[varId] = new NLMISC::CVariable<std::string>("StateInstanceVar", varId.c_str(), "", std::string()); _StrNelVar[varId] = new NLMISC::CVariable<std::string>("StateInstanceVar", varId.c_str(), "", std::string());
_NelVar[varId]->get(); return _NelVar[varId]->get();
}
return it->second->get();
} }
inline inline