Merge with develop

This commit is contained in:
kervala 2016-10-26 14:30:17 +02:00
parent 956da7f9da
commit c9244568eb

View file

@ -2481,17 +2481,25 @@ class CAHAddShape : public IActionHandler
virtual void execute (CCtrlBase * /* pCaller */, const string &Params)
{
string sShape = getParam(Params, "shape");
if(sShape.empty())
if (sShape.empty())
{
nlwarning("Command 'add_shape': need at least the parameter shape.");
return;
}
if (!Scene)
{
nlwarning("No scene available");
return;
}
if (!UserEntity)
{
nlwarning("UserEntity not yet defined, possibly called runAH from Lua");
return;
}
double x = UserEntity->pos().x;
double y = UserEntity->pos().y;
double z = UserEntity->pos().z;