Skip to content
Permalink
Browse files
is_player() is no player-only function
  • Loading branch information
est31 committed May 12, 2015
1 parent 02805af commit b4c3ff6eab197828d370c30d66e033cde9d2f13d
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 14 deletions.
@@ -2387,6 +2387,7 @@ This is basically a reference to a C++ `ServerActiveObject`
* `position`: `{x=num, y=num, z=num}` (relative)
* `rotation`: `{x=num, y=num, z=num}`
* `set_properties(object property table)`
* `is_player()`: returns true for players, false otherwise

##### LuaEntitySAO-only (no-op for other objects)
* `setvelocity({x=num, y=num, z=num})`
@@ -2404,7 +2405,6 @@ This is basically a reference to a C++ `ServerActiveObject`
* `get_luaentity()`

##### Player-only (no-op for other objects)
* `is_player()`: true for players, false for others
* `get_player_name()`: returns `""` if is not a player
* `get_look_dir()`: get camera direction as a unit vector
* `get_look_pitch()`: pitch in radians
@@ -557,6 +557,16 @@ int ObjectRef::l_set_properties(lua_State *L)
return 0;
}

// is_player(self)
int ObjectRef::l_is_player(lua_State *L)
{
NO_MAP_LOCK_REQUIRED;
ObjectRef *ref = checkobject(L, 1);
Player *player = getplayer(ref);
lua_pushboolean(L, (player != NULL));
return 1;
}

/* LuaEntitySAO-only */

// setvelocity(self, {x=num, y=num, z=num})
@@ -705,16 +715,6 @@ int ObjectRef::l_get_luaentity(lua_State *L)

/* Player-only */

// is_player(self)
int ObjectRef::l_is_player(lua_State *L)
{
NO_MAP_LOCK_REQUIRED;
ObjectRef *ref = checkobject(L, 1);
Player *player = getplayer(ref);
lua_pushboolean(L, (player != NULL));
return 1;
}

// is_player_connected(self)
int ObjectRef::l_is_player_connected(lua_State *L)
{
@@ -120,6 +120,9 @@ class ObjectRef : public ModApiBase {
// set_properties(self, properties)
static int l_set_properties(lua_State *L);

// is_player(self)
static int l_is_player(lua_State *L);

/* LuaEntitySAO-only */

// setvelocity(self, {x=num, y=num, z=num})
@@ -156,9 +159,6 @@ class ObjectRef : public ModApiBase {

/* Player-only */

// is_player(self)
static int l_is_player(lua_State *L);

// is_player_connected(self)
static int l_is_player_connected(lua_State *L);

0 comments on commit b4c3ff6

Please sign in to comment.