aboutsummaryrefslogtreecommitdiff
path: root/src/script/lua_api
diff options
context:
space:
mode:
authorLoic Blot <loic.blot@unix-experience.fr>2020-04-11 09:59:09 +0200
committerLoïc Blot <nerzhul@users.noreply.github.com>2020-04-11 16:07:17 +0200
commit894a34aef48024a752a1ef151d046955d83858d0 (patch)
treef264d4c1ba7a62fe731255594f592bd78b3e09a5 /src/script/lua_api
parentc99e8df07fe88c0b19363beca09e12f151bc13d0 (diff)
downloadminetest-894a34aef48024a752a1ef151d046955d83858d0.tar.gz
minetest-894a34aef48024a752a1ef151d046955d83858d0.tar.bz2
minetest-894a34aef48024a752a1ef151d046955d83858d0.zip
Move PlayerSAO to dedicated files
Diffstat (limited to 'src/script/lua_api')
-rw-r--r--src/script/lua_api/l_env.cpp3
-rw-r--r--src/script/lua_api/l_object.cpp2
2 files changed, 3 insertions, 2 deletions
diff --git a/src/script/lua_api/l_env.cpp b/src/script/lua_api/l_env.cpp
index 31e582d3d..438669feb 100644
--- a/src/script/lua_api/l_env.cpp
+++ b/src/script/lua_api/l_env.cpp
@@ -17,6 +17,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
+#include <algorithm>
#include "lua_api/l_env.h"
#include "lua_api/l_internal.h"
#include "lua_api/l_nodemeta.h"
@@ -25,7 +26,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#include "lua_api/l_vmanip.h"
#include "common/c_converter.h"
#include "common/c_content.h"
-#include <algorithm>
#include "scripting_server.h"
#include "environment.h"
#include "mapblock.h"
@@ -39,6 +39,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#include "pathfinder.h"
#include "face_position_cache.h"
#include "remoteplayer.h"
+#include "server/player_sao.h"
#ifndef SERVER
#include "client/client.h"
#endif
diff --git a/src/script/lua_api/l_object.cpp b/src/script/lua_api/l_object.cpp
index 1ea144a1c..95c96235e 100644
--- a/src/script/lua_api/l_object.cpp
+++ b/src/script/lua_api/l_object.cpp
@@ -27,12 +27,12 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#include "common/c_content.h"
#include "log.h"
#include "tool.h"
-#include "server/serveractiveobject.h"
#include "content_sao.h"
#include "remoteplayer.h"
#include "server.h"
#include "hud.h"
#include "scripting_server.h"
+#include "server/player_sao.h"
/*
ObjectRef