diff options
| author | Paramat <paramat@users.noreply.github.com> | 2019-01-03 11:10:07 +0000 |
|---|---|---|
| committer | Loïc Blot <nerzhul@users.noreply.github.com> | 2019-01-03 12:10:07 +0100 |
| commit | ceacff13a666779d75ac48f2cc5c11bc2ce5c6e1 (patch) | |
| tree | ad82bd3a44ced8af130f372fb1c3df8d389b3bdd /src/client/game.cpp | |
| parent | c26eab6319b64089a32e43cf1626f9583947572a (diff) | |
| download | dragonfireclient-ceacff13a666779d75ac48f2cc5c11bc2ce5c6e1.tar.xz | |
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.
Diffstat (limited to 'src/client/game.cpp')
| -rw-r--r-- | src/client/game.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
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(); |