aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/client.cpp2
-rw-r--r--src/clientenvironment.cpp2
-rw-r--r--src/content_abm.cpp2
-rw-r--r--src/content_sao.cpp2
-rw-r--r--src/emerge.cpp2
-rw-r--r--src/environment.cpp2
-rw-r--r--src/game.cpp2
-rw-r--r--src/guiFormSpecMenu.cpp2
-rw-r--r--src/inventorymanager.cpp2
-rw-r--r--src/map.cpp2
-rw-r--r--src/network/clientpackethandler.cpp2
-rw-r--r--src/network/serverpackethandler.cpp2
-rw-r--r--src/script/CMakeLists.txt4
-rw-r--r--src/script/lua_api/l_env.cpp2
-rw-r--r--src/script/lua_api/l_object.cpp2
-rw-r--r--src/script/scripting_client.cpp (renamed from src/script/clientscripting.cpp)2
-rw-r--r--src/script/scripting_client.h (renamed from src/script/clientscripting.h)0
-rw-r--r--src/script/scripting_server.cpp (renamed from src/script/serverscripting.cpp)2
-rw-r--r--src/script/scripting_server.h (renamed from src/script/serverscripting.h)0
-rw-r--r--src/server.cpp2
-rw-r--r--src/serverenvironment.cpp2
21 files changed, 20 insertions, 20 deletions
diff --git a/src/client.cpp b/src/client.cpp
index 94c808a57..19fe9b0ba 100644
--- a/src/client.cpp
+++ b/src/client.cpp
@@ -45,7 +45,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#include "database-sqlite3.h"
#include "serialization.h"
#include "guiscalingfilter.h"
-#include "script/clientscripting.h"
+#include "script/scripting_client.h"
#include "game.h"
extern gui::IGUIEnvironment* guienv;
diff --git a/src/clientenvironment.cpp b/src/clientenvironment.cpp
index 4a8bbb066..cc75fd2d6 100644
--- a/src/clientenvironment.cpp
+++ b/src/clientenvironment.cpp
@@ -22,7 +22,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#include "clientenvironment.h"
#include "clientsimpleobject.h"
#include "clientmap.h"
-#include "clientscripting.h"
+#include "scripting_client.h"
#include "mapblock_mesh.h"
#include "event.h"
#include "collision.h"
diff --git a/src/content_abm.cpp b/src/content_abm.cpp
index 1e175c64f..162f93364 100644
--- a/src/content_abm.cpp
+++ b/src/content_abm.cpp
@@ -26,7 +26,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#include "settings.h"
#include "mapblock.h" // For getNodeBlockPos
#include "map.h"
-#include "serverscripting.h"
+#include "scripting_server.h"
#include "log.h"
void add_legacy_abms(ServerEnvironment *env, INodeDefManager *nodedef)
diff --git a/src/content_sao.cpp b/src/content_sao.cpp
index caf6dcbab..81c6902f5 100644
--- a/src/content_sao.cpp
+++ b/src/content_sao.cpp
@@ -26,7 +26,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#include "nodedef.h"
#include "remoteplayer.h"
#include "server.h"
-#include "serverscripting.h"
+#include "scripting_server.h"
#include "genericobject.h"
std::map<u16, ServerActiveObject::Factory> ServerActiveObject::m_types;
diff --git a/src/emerge.cpp b/src/emerge.cpp
index 4c3a83f7e..d24971e44 100644
--- a/src/emerge.cpp
+++ b/src/emerge.cpp
@@ -40,7 +40,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#include "mg_schematic.h"
#include "nodedef.h"
#include "profiler.h"
-#include "serverscripting.h"
+#include "scripting_server.h"
#include "server.h"
#include "serverobject.h"
#include "settings.h"
diff --git a/src/environment.cpp b/src/environment.cpp
index c1aeeec60..4e782db81 100644
--- a/src/environment.cpp
+++ b/src/environment.cpp
@@ -21,7 +21,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#include "environment.h"
#include "collision.h"
#include "serverobject.h"
-#include "serverscripting.h"
+#include "scripting_server.h"
#include "server.h"
#include "daynightratio.h"
#include "emerge.h"
diff --git a/src/game.cpp b/src/game.cpp
index 31a48531c..97dc8c064 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -60,7 +60,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#include "version.h"
#include "minimap.h"
#include "mapblock_mesh.h"
-#include "script/clientscripting.h"
+#include "script/scripting_client.h"
#include "sound.h"
diff --git a/src/guiFormSpecMenu.cpp b/src/guiFormSpecMenu.cpp
index 5861e9a81..14d576f8f 100644
--- a/src/guiFormSpecMenu.cpp
+++ b/src/guiFormSpecMenu.cpp
@@ -42,7 +42,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#include "filesys.h"
#include "gettime.h"
#include "gettext.h"
-#include "serverscripting.h"
+#include "scripting_server.h"
#include "porting.h"
#include "settings.h"
#include "client.h"
diff --git a/src/inventorymanager.cpp b/src/inventorymanager.cpp
index 6ebc2994b..c976bd037 100644
--- a/src/inventorymanager.cpp
+++ b/src/inventorymanager.cpp
@@ -20,7 +20,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#include "inventorymanager.h"
#include "log.h"
#include "serverenvironment.h"
-#include "serverscripting.h"
+#include "scripting_server.h"
#include "serverobject.h"
#include "settings.h"
#include "craftdef.h"
diff --git a/src/map.cpp b/src/map.cpp
index c148c51f1..9e8823f84 100644
--- a/src/map.cpp
+++ b/src/map.cpp
@@ -44,7 +44,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#include "database.h"
#include "database-dummy.h"
#include "database-sqlite3.h"
-#include "script/serverscripting.h"
+#include "script/scripting_server.h"
#include <deque>
#include <queue>
#if USE_LEVELDB
diff --git a/src/network/clientpackethandler.cpp b/src/network/clientpackethandler.cpp
index 42c49be3c..772ffe905 100644
--- a/src/network/clientpackethandler.cpp
+++ b/src/network/clientpackethandler.cpp
@@ -30,7 +30,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#include "server.h"
#include "util/strfnd.h"
#include "network/clientopcodes.h"
-#include "script/clientscripting.h"
+#include "script/scripting_client.h"
#include "util/serialize.h"
#include "util/srp.h"
#include "tileanimation.h"
diff --git a/src/network/serverpackethandler.cpp b/src/network/serverpackethandler.cpp
index c284cb6c8..5b026bbdb 100644
--- a/src/network/serverpackethandler.cpp
+++ b/src/network/serverpackethandler.cpp
@@ -27,7 +27,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#include "nodedef.h"
#include "player.h"
#include "rollback_interface.h"
-#include "serverscripting.h"
+#include "scripting_server.h"
#include "settings.h"
#include "tool.h"
#include "version.h"
diff --git a/src/script/CMakeLists.txt b/src/script/CMakeLists.txt
index c96ccc816..bebe2f037 100644
--- a/src/script/CMakeLists.txt
+++ b/src/script/CMakeLists.txt
@@ -4,7 +4,7 @@ add_subdirectory(lua_api)
# Used by server and client
set(common_SCRIPT_SRCS
- ${CMAKE_CURRENT_SOURCE_DIR}/serverscripting.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/scripting_server.cpp
${common_SCRIPT_COMMON_SRCS}
${common_SCRIPT_CPP_API_SRCS}
${common_SCRIPT_LUA_API_SRCS}
@@ -13,7 +13,7 @@ set(common_SCRIPT_SRCS
# Used by client only
set(client_SCRIPT_SRCS
${CMAKE_CURRENT_SOURCE_DIR}/scripting_mainmenu.cpp
- ${CMAKE_CURRENT_SOURCE_DIR}/clientscripting.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/scripting_client.cpp
${client_SCRIPT_COMMON_SRCS}
${client_SCRIPT_CPP_API_SRCS}
${client_SCRIPT_LUA_API_SRCS}
diff --git a/src/script/lua_api/l_env.cpp b/src/script/lua_api/l_env.cpp
index 75b07fa37..85791f90b 100644
--- a/src/script/lua_api/l_env.cpp
+++ b/src/script/lua_api/l_env.cpp
@@ -25,7 +25,7 @@ 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 "serverscripting.h"
+#include "scripting_server.h"
#include "environment.h"
#include "server.h"
#include "nodedef.h"
diff --git a/src/script/lua_api/l_object.cpp b/src/script/lua_api/l_object.cpp
index 95e977f9e..9668f76f7 100644
--- a/src/script/lua_api/l_object.cpp
+++ b/src/script/lua_api/l_object.cpp
@@ -29,7 +29,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#include "content_sao.h"
#include "server.h"
#include "hud.h"
-#include "serverscripting.h"
+#include "scripting_server.h"
struct EnumString es_HudElementType[] =
{
diff --git a/src/script/clientscripting.cpp b/src/script/scripting_client.cpp
index ba3f910c0..8ff5abcc4 100644
--- a/src/script/clientscripting.cpp
+++ b/src/script/scripting_client.cpp
@@ -18,7 +18,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-#include "clientscripting.h"
+#include "scripting_client.h"
#include "client.h"
#include "cpp_api/s_internal.h"
#include "lua_api/l_client.h"
diff --git a/src/script/clientscripting.h b/src/script/scripting_client.h
index df94e8b71..df94e8b71 100644
--- a/src/script/clientscripting.h
+++ b/src/script/scripting_client.h
diff --git a/src/script/serverscripting.cpp b/src/script/scripting_server.cpp
index 215b2cfd7..ce56fcf19 100644
--- a/src/script/serverscripting.cpp
+++ b/src/script/scripting_server.cpp
@@ -17,7 +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 "serverscripting.h"
+#include "scripting_server.h"
#include "server.h"
#include "log.h"
#include "settings.h"
diff --git a/src/script/serverscripting.h b/src/script/scripting_server.h
index fd97ea40b..fd97ea40b 100644
--- a/src/script/serverscripting.h
+++ b/src/script/scripting_server.h
diff --git a/src/server.cpp b/src/server.cpp
index 4c7e60286..2edf83947 100644
--- a/src/server.cpp
+++ b/src/server.cpp
@@ -38,7 +38,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#include "settings.h"
#include "profiler.h"
#include "log.h"
-#include "serverscripting.h"
+#include "scripting_server.h"
#include "nodedef.h"
#include "itemdef.h"
#include "craftdef.h"
diff --git a/src/serverenvironment.cpp b/src/serverenvironment.cpp
index c0dc0e0ea..4d2c87a4d 100644
--- a/src/serverenvironment.cpp
+++ b/src/serverenvironment.cpp
@@ -28,7 +28,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#include "profiler.h"
#include "raycast.h"
#include "remoteplayer.h"
-#include "serverscripting.h"
+#include "scripting_server.h"
#include "server.h"
#include "voxelalgorithms.h"
#include "util/serialize.h"
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-11 17:30:29 +0000