RealBadAngel's patch which allows the lua api to read pressed player keys. This should make it possible to change the player's animation based on what he is doing

Correct lua api version number

Always update animations and attachments after the entity is added to scene client side. Fixes animations not being applied in client initialization for some reason. Attachments should be re-tested now just to be safe.

Fix a segmentation fault caused by reaching materials that didn't exist in a loop for setting texture

1 files changed, 50 insertions, 1 deletions

diff --git a/src/scriptapi.cpp b/src/scriptapi.cpp
index 2b2ccfcec..91100d311 100644
--- a/src/scriptapi.cpp
+++ b/src/scriptapi.cpp
@@ -3025,7 +3025,54 @@ private:
 		lua_pushlstring(L, formspec.c_str(), formspec.size());
 		return 1;
 	}
-
+	
+	// get_player_control(self)
+	static int l_get_player_control(lua_State *L)
+	{
+		ObjectRef *ref = checkobject(L, 1);
+		Player *player = getplayer(ref);
+		if(player == NULL){
+			lua_pushlstring(L, "", 0);
+			return 1;
+		}
+		// Do it
+		PlayerControl control = player->getPlayerControl();
+		lua_newtable(L);
+		lua_pushboolean(L, control.up);
+		lua_setfield(L, -2, "up");
+		lua_pushboolean(L, control.down);
+		lua_setfield(L, -2, "down");
+		lua_pushboolean(L, control.left);
+		lua_setfield(L, -2, "left");
+		lua_pushboolean(L, control.right);
+		lua_setfield(L, -2, "right");
+		lua_pushboolean(L, control.jump);
+		lua_setfield(L, -2, "jump");
+		lua_pushboolean(L, control.aux1);
+		lua_setfield(L, -2, "aux1");
+		lua_pushboolean(L, control.sneak);
+		lua_setfield(L, -2, "sneak");
+		lua_pushboolean(L, control.LMB);
+		lua_setfield(L, -2, "LMB");
+		lua_pushboolean(L, control.RMB);
+		lua_setfield(L, -2, "RMB");
+		return 1;
+	}
+	
+	// get_player_control_bits(self)
+	static int l_get_player_control_bits(lua_State *L)
+	{
+		ObjectRef *ref = checkobject(L, 1);
+		Player *player = getplayer(ref);
+		if(player == NULL){
+			lua_pushlstring(L, "", 0);
+			return 1;
+		}
+		// Do it	
+		lua_pushnumber(L, player->keyPressed);
+		return 1;
+	}
+	
 public:
 	ObjectRef(ServerActiveObject *object):
 		m_object(object)
@@ -3128,6 +3175,8 @@ const luaL_reg ObjectRef::methods[] = {
 	method(ObjectRef, get_look_yaw),
 	method(ObjectRef, set_inventory_formspec),
 	method(ObjectRef, get_inventory_formspec),
+	method(ObjectRef, get_player_control),
+	method(ObjectRef, get_player_control_bits),
 	{0,0}
 };