Merge nightsplus-laplogic

src/d_player.h

src/lua_playerlib.c

src/p_map.c

src/p_saveg.c

src/p_setup.c

src/p_user.c