From ceacff13a666779d75ac48f2cc5c11bc2ce5c6e1 Mon Sep 17 00:00:00 2001 From: Paramat Date: Thu, 3 Jan 2019 11:10:07 +0000 Subject: CSM restrictions: Make 'LOAD_CLIENT_MODS' disable loading of 'builtin' (#8000) Previously, when the CSM restriction 'LOAD_CLIENT_MODS' was used a client was still able to add CSM code to 'builtin' to bypass that restriction, because 'builtin' is not yet verified. Until server-sent CSM and verifying of 'builtin' are complete, make 'LOAD_CLIENT_MODS' disable the loading of builtin. Clarify code comments and messages to distinguish between client-side modding and client-side scripting. 'Scripting' includes 'builtin', 'modding' does not. --- src/client/game.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/client/game.cpp') diff --git a/src/client/game.cpp b/src/client/game.cpp index bd37bd58a..28f6a90ed 100644 --- a/src/client/game.cpp +++ b/src/client/game.cpp @@ -1891,7 +1891,7 @@ void Game::processKeyInput() if (client->moddingEnabled()) openConsole(0.2, L"."); else - m_game_ui->showStatusText(wgettext("CSM is disabled")); + m_game_ui->showStatusText(wgettext("Client side scripting is disabled")); } else if (wasKeyDown(KeyType::CONSOLE)) { openConsole(core::clamp(g_settings->getFloat("console_height"), 0.1f, 1.0f)); } else if (wasKeyDown(KeyType::FREEMOVE)) { @@ -2554,7 +2554,7 @@ void Game::handleClientEvent_PlayerForceMove(ClientEvent *event, CameraOrientati void Game::handleClientEvent_Deathscreen(ClientEvent *event, CameraOrientation *cam) { - // If CSM enabled, deathscreen is handled by CSM code in + // If client scripting is enabled, deathscreen is handled by CSM code in // builtin/client/init.lua if (client->moddingEnabled()) client->getScript()->on_death(); -- cgit v1.2.3