diff options
Diffstat (limited to 'src/script')
-rw-r--r-- | src/script/cpp_api/s_base.cpp | 2 | ||||
-rw-r--r-- | src/script/cpp_api/s_client.cpp | 2 | ||||
-rw-r--r-- | src/script/cpp_api/s_security.cpp | 2 | ||||
-rw-r--r-- | src/script/lua_api/l_camera.cpp | 6 | ||||
-rw-r--r-- | src/script/lua_api/l_client.cpp | 4 | ||||
-rw-r--r-- | src/script/lua_api/l_env.cpp | 2 | ||||
-rw-r--r-- | src/script/lua_api/l_localplayer.cpp | 2 | ||||
-rw-r--r-- | src/script/lua_api/l_minimap.cpp | 4 | ||||
-rw-r--r-- | src/script/lua_api/l_particles.cpp | 2 | ||||
-rw-r--r-- | src/script/lua_api/l_particles_local.cpp | 4 | ||||
-rw-r--r-- | src/script/scripting_client.cpp | 2 |
11 files changed, 16 insertions, 16 deletions
diff --git a/src/script/cpp_api/s_base.cpp b/src/script/cpp_api/s_base.cpp index d98359d20..bf89f748c 100644 --- a/src/script/cpp_api/s_base.cpp +++ b/src/script/cpp_api/s_base.cpp @@ -29,7 +29,7 @@ with this program; if not, write to the Free Software Foundation, Inc., #include "util/string.h" #include "server.h" #ifndef SERVER -#include "client.h" +#include "client/client.h" #endif diff --git a/src/script/cpp_api/s_client.cpp b/src/script/cpp_api/s_client.cpp index 597883c2f..f2cc9730b 100644 --- a/src/script/cpp_api/s_client.cpp +++ b/src/script/cpp_api/s_client.cpp @@ -20,7 +20,7 @@ with this program; if not, write to the Free Software Foundation, Inc., #include "s_client.h" #include "s_internal.h" -#include "client.h" +#include "client/client.h" #include "common/c_converter.h" #include "common/c_content.h" #include "s_item.h" diff --git a/src/script/cpp_api/s_security.cpp b/src/script/cpp_api/s_security.cpp index e87f16ddd..e9067a54c 100644 --- a/src/script/cpp_api/s_security.cpp +++ b/src/script/cpp_api/s_security.cpp @@ -22,7 +22,7 @@ with this program; if not, write to the Free Software Foundation, Inc., #include "filesys.h" #include "porting.h" #include "server.h" -#include "client.h" +#include "client/client.h" #include "settings.h" #include <cerrno> diff --git a/src/script/lua_api/l_camera.cpp b/src/script/lua_api/l_camera.cpp index 326cc6d53..462006777 100644 --- a/src/script/lua_api/l_camera.cpp +++ b/src/script/lua_api/l_camera.cpp @@ -21,9 +21,9 @@ with this program; if not, write to the Free Software Foundation, Inc., #include <cmath> #include "script/common/c_converter.h" #include "l_internal.h" -#include "content_cao.h" -#include "camera.h" -#include "client.h" +#include "client/content_cao.h" +#include "client/camera.h" +#include "client/client.h" LuaCamera::LuaCamera(Camera *m) : m_camera(m) { diff --git a/src/script/lua_api/l_client.cpp b/src/script/lua_api/l_client.cpp index 72826775b..8a5867a32 100644 --- a/src/script/lua_api/l_client.cpp +++ b/src/script/lua_api/l_client.cpp @@ -20,10 +20,10 @@ with this program; if not, write to the Free Software Foundation, Inc., #include "l_client.h" #include "chatmessage.h" -#include "client.h" +#include "client/client.h" #include "client/clientevent.h" #include "client/sound.h" -#include "clientenvironment.h" +#include "client/clientenvironment.h" #include "common/c_content.h" #include "common/c_converter.h" #include "cpp_api/s_base.h" diff --git a/src/script/lua_api/l_env.cpp b/src/script/lua_api/l_env.cpp index 1e5149f7a..ba2be0cb5 100644 --- a/src/script/lua_api/l_env.cpp +++ b/src/script/lua_api/l_env.cpp @@ -40,7 +40,7 @@ with this program; if not, write to the Free Software Foundation, Inc., #include "face_position_cache.h" #include "remoteplayer.h" #ifndef SERVER -#include "client.h" +#include "client/client.h" #endif struct EnumString ModApiEnvMod::es_ClearObjectsMode[] = diff --git a/src/script/lua_api/l_localplayer.cpp b/src/script/lua_api/l_localplayer.cpp index 492422d92..7444d0e88 100644 --- a/src/script/lua_api/l_localplayer.cpp +++ b/src/script/lua_api/l_localplayer.cpp @@ -20,7 +20,7 @@ with this program; if not, write to the Free Software Foundation, Inc., #include "l_localplayer.h" #include "l_internal.h" #include "script/common/c_converter.h" -#include "localplayer.h" +#include "client/localplayer.h" #include "hud.h" #include "common/c_content.h" diff --git a/src/script/lua_api/l_minimap.cpp b/src/script/lua_api/l_minimap.cpp index b59e79095..5fba76eb8 100644 --- a/src/script/lua_api/l_minimap.cpp +++ b/src/script/lua_api/l_minimap.cpp @@ -21,8 +21,8 @@ with this program; if not, write to the Free Software Foundation, Inc., #include "lua_api/l_minimap.h" #include "lua_api/l_internal.h" #include "common/c_converter.h" -#include "client.h" -#include "minimap.h" +#include "client/client.h" +#include "client/minimap.h" #include "settings.h" LuaMinimap::LuaMinimap(Minimap *m) : m_minimap(m) diff --git a/src/script/lua_api/l_particles.cpp b/src/script/lua_api/l_particles.cpp index 7783e5910..340903ebf 100644 --- a/src/script/lua_api/l_particles.cpp +++ b/src/script/lua_api/l_particles.cpp @@ -23,7 +23,7 @@ with this program; if not, write to the Free Software Foundation, Inc., #include "common/c_converter.h" #include "common/c_content.h" #include "server.h" -#include "particles.h" +#include "client/particles.h" // add_particle({pos=, velocity=, acceleration=, expirationtime=, // size=, collisiondetection=, collision_removal=, object_collision=, diff --git a/src/script/lua_api/l_particles_local.cpp b/src/script/lua_api/l_particles_local.cpp index d5c412556..3c7a821ca 100644 --- a/src/script/lua_api/l_particles_local.cpp +++ b/src/script/lua_api/l_particles_local.cpp @@ -23,8 +23,8 @@ with this program; if not, write to the Free Software Foundation, Inc., #include "common/c_converter.h" #include "lua_api/l_internal.h" #include "lua_api/l_object.h" -#include "particles.h" -#include "client.h" +#include "client/particles.h" +#include "client/client.h" #include "client/clientevent.h" int ModApiParticlesLocal::l_add_particle(lua_State *L) diff --git a/src/script/scripting_client.cpp b/src/script/scripting_client.cpp index a6511ffd5..86e5f2874 100644 --- a/src/script/scripting_client.cpp +++ b/src/script/scripting_client.cpp @@ -19,7 +19,7 @@ with this program; if not, write to the Free Software Foundation, Inc., */ #include "scripting_client.h" -#include "client.h" +#include "client/client.h" #include "cpp_api/s_internal.h" #include "lua_api/l_client.h" #include "lua_api/l_env.h" |