Skip to content

Commit 2818d3f

Browse files
ShadowNinjaShadowNinja
committedApr 25, 2017
Rename Scripting API files for consistency
·
5.11.00.4.16
1 parent db17225 commit 2818d3f

21 files changed

+20
-20
lines changed
 

Diff for: ‎src/client.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
4545
#include "database-sqlite3.h"
4646
#include "serialization.h"
4747
#include "guiscalingfilter.h"
48-
#include "script/clientscripting.h"
48+
#include "script/scripting_client.h"
4949
#include "game.h"
5050

5151
extern gui::IGUIEnvironment* guienv;

Diff for: ‎src/clientenvironment.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
2222
#include "clientenvironment.h"
2323
#include "clientsimpleobject.h"
2424
#include "clientmap.h"
25-
#include "clientscripting.h"
25+
#include "scripting_client.h"
2626
#include "mapblock_mesh.h"
2727
#include "event.h"
2828
#include "collision.h"

Diff for: ‎src/content_abm.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
2626
#include "settings.h"
2727
#include "mapblock.h" // For getNodeBlockPos
2828
#include "map.h"
29-
#include "serverscripting.h"
29+
#include "scripting_server.h"
3030
#include "log.h"
3131

3232
void add_legacy_abms(ServerEnvironment *env, INodeDefManager *nodedef)

Diff for: ‎src/content_sao.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
2626
#include "nodedef.h"
2727
#include "remoteplayer.h"
2828
#include "server.h"
29-
#include "serverscripting.h"
29+
#include "scripting_server.h"
3030
#include "genericobject.h"
3131

3232
std::map<u16, ServerActiveObject::Factory> ServerActiveObject::m_types;

Diff for: ‎src/emerge.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
4040
#include "mg_schematic.h"
4141
#include "nodedef.h"
4242
#include "profiler.h"
43-
#include "serverscripting.h"
43+
#include "scripting_server.h"
4444
#include "server.h"
4545
#include "serverobject.h"
4646
#include "settings.h"

Diff for: ‎src/environment.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
2121
#include "environment.h"
2222
#include "collision.h"
2323
#include "serverobject.h"
24-
#include "serverscripting.h"
24+
#include "scripting_server.h"
2525
#include "server.h"
2626
#include "daynightratio.h"
2727
#include "emerge.h"

Diff for: ‎src/game.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
6060
#include "version.h"
6161
#include "minimap.h"
6262
#include "mapblock_mesh.h"
63-
#include "script/clientscripting.h"
63+
#include "script/scripting_client.h"
6464

6565
#include "sound.h"
6666

Diff for: ‎src/guiFormSpecMenu.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
4242
#include "filesys.h"
4343
#include "gettime.h"
4444
#include "gettext.h"
45-
#include "serverscripting.h"
45+
#include "scripting_server.h"
4646
#include "porting.h"
4747
#include "settings.h"
4848
#include "client.h"

Diff for: ‎src/inventorymanager.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
2020
#include "inventorymanager.h"
2121
#include "log.h"
2222
#include "serverenvironment.h"
23-
#include "serverscripting.h"
23+
#include "scripting_server.h"
2424
#include "serverobject.h"
2525
#include "settings.h"
2626
#include "craftdef.h"

Diff for: ‎src/map.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
4444
#include "database.h"
4545
#include "database-dummy.h"
4646
#include "database-sqlite3.h"
47-
#include "script/serverscripting.h"
47+
#include "script/scripting_server.h"
4848
#include <deque>
4949
#include <queue>
5050
#if USE_LEVELDB

Diff for: ‎src/network/clientpackethandler.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
3030
#include "server.h"
3131
#include "util/strfnd.h"
3232
#include "network/clientopcodes.h"
33-
#include "script/clientscripting.h"
33+
#include "script/scripting_client.h"
3434
#include "util/serialize.h"
3535
#include "util/srp.h"
3636
#include "tileanimation.h"

Diff for: ‎src/network/serverpackethandler.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
2727
#include "nodedef.h"
2828
#include "player.h"
2929
#include "rollback_interface.h"
30-
#include "serverscripting.h"
30+
#include "scripting_server.h"
3131
#include "settings.h"
3232
#include "tool.h"
3333
#include "version.h"

Diff for: ‎src/script/CMakeLists.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ add_subdirectory(lua_api)
44

55
# Used by server and client
66
set(common_SCRIPT_SRCS
7-
${CMAKE_CURRENT_SOURCE_DIR}/serverscripting.cpp
7+
${CMAKE_CURRENT_SOURCE_DIR}/scripting_server.cpp
88
${common_SCRIPT_COMMON_SRCS}
99
${common_SCRIPT_CPP_API_SRCS}
1010
${common_SCRIPT_LUA_API_SRCS}
@@ -13,7 +13,7 @@ set(common_SCRIPT_SRCS
1313
# Used by client only
1414
set(client_SCRIPT_SRCS
1515
${CMAKE_CURRENT_SOURCE_DIR}/scripting_mainmenu.cpp
16-
${CMAKE_CURRENT_SOURCE_DIR}/clientscripting.cpp
16+
${CMAKE_CURRENT_SOURCE_DIR}/scripting_client.cpp
1717
${client_SCRIPT_COMMON_SRCS}
1818
${client_SCRIPT_CPP_API_SRCS}
1919
${client_SCRIPT_LUA_API_SRCS}

Diff for: ‎src/script/lua_api/l_env.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
2525
#include "lua_api/l_vmanip.h"
2626
#include "common/c_converter.h"
2727
#include "common/c_content.h"
28-
#include "serverscripting.h"
28+
#include "scripting_server.h"
2929
#include "environment.h"
3030
#include "server.h"
3131
#include "nodedef.h"

Diff for: ‎src/script/lua_api/l_object.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
2929
#include "content_sao.h"
3030
#include "server.h"
3131
#include "hud.h"
32-
#include "serverscripting.h"
32+
#include "scripting_server.h"
3333

3434
struct EnumString es_HudElementType[] =
3535
{

Diff for: ‎src/script/clientscripting.cpp renamed to ‎src/script/scripting_client.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
1818
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
1919
*/
2020

21-
#include "clientscripting.h"
21+
#include "scripting_client.h"
2222
#include "client.h"
2323
#include "cpp_api/s_internal.h"
2424
#include "lua_api/l_client.h"

Diff for: ‎src/script/clientscripting.h renamed to ‎src/script/scripting_client.h

File renamed without changes.

Diff for: ‎src/script/serverscripting.cpp renamed to ‎src/script/scripting_server.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
1717
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
1818
*/
1919

20-
#include "serverscripting.h"
20+
#include "scripting_server.h"
2121
#include "server.h"
2222
#include "log.h"
2323
#include "settings.h"

Diff for: ‎src/script/serverscripting.h renamed to ‎src/script/scripting_server.h

File renamed without changes.

Diff for: ‎src/server.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
3838
#include "settings.h"
3939
#include "profiler.h"
4040
#include "log.h"
41-
#include "serverscripting.h"
41+
#include "scripting_server.h"
4242
#include "nodedef.h"
4343
#include "itemdef.h"
4444
#include "craftdef.h"

Diff for: ‎src/serverenvironment.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
2828
#include "profiler.h"
2929
#include "raycast.h"
3030
#include "remoteplayer.h"
31-
#include "serverscripting.h"
31+
#include "scripting_server.h"
3232
#include "server.h"
3333
#include "voxelalgorithms.h"
3434
#include "util/serialize.h"

0 commit comments

Comments
 (0)
Please sign in to comment.