Merge with develop
This commit is contained in:
parent
956da7f9da
commit
c9244568eb
1 changed files with 9 additions and 1 deletions
|
@ -2481,17 +2481,25 @@ class CAHAddShape : public IActionHandler
|
||||||
virtual void execute (CCtrlBase * /* pCaller */, const string &Params)
|
virtual void execute (CCtrlBase * /* pCaller */, const string &Params)
|
||||||
{
|
{
|
||||||
string sShape = getParam(Params, "shape");
|
string sShape = getParam(Params, "shape");
|
||||||
if(sShape.empty())
|
|
||||||
|
if (sShape.empty())
|
||||||
{
|
{
|
||||||
nlwarning("Command 'add_shape': need at least the parameter shape.");
|
nlwarning("Command 'add_shape': need at least the parameter shape.");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!Scene)
|
if (!Scene)
|
||||||
{
|
{
|
||||||
nlwarning("No scene available");
|
nlwarning("No scene available");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (!UserEntity)
|
||||||
|
{
|
||||||
|
nlwarning("UserEntity not yet defined, possibly called runAH from Lua");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
double x = UserEntity->pos().x;
|
double x = UserEntity->pos().x;
|
||||||
double y = UserEntity->pos().y;
|
double y = UserEntity->pos().y;
|
||||||
double z = UserEntity->pos().z;
|
double z = UserEntity->pos().z;
|
||||||
|
|
Loading…
Reference in a new issue