summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorEzhh <owlecho@live.com>2017-01-29 16:10:17 +0000
committerZeno- <kde.psych@gmail.com>2017-01-30 02:10:17 +1000
commit0c9189d10989f85cd5148107b643dc17a49c06ff (patch)
treed534d5780f470d9e53596fff9827b6d0438c05ec /src
parent707e27b5c26b6c082abbd2f385a976c5bc8964fe (diff)
downloadminetest-0c9189d10989f85cd5148107b643dc17a49c06ff.tar.gz
minetest-0c9189d10989f85cd5148107b643dc17a49c06ff.tar.bz2
minetest-0c9189d10989f85cd5148107b643dc17a49c06ff.zip
Add console height setting (#5136)
Diffstat (limited to 'src')
-rw-r--r--src/defaultsettings.cpp1
-rw-r--r--src/game.cpp3
2 files changed, 3 insertions, 1 deletions
diff --git a/src/defaultsettings.cpp b/src/defaultsettings.cpp
index e154a63c8..84046f61c 100644
--- a/src/defaultsettings.cpp
+++ b/src/defaultsettings.cpp
@@ -138,6 +138,7 @@ void set_default_settings(Settings *settings)
settings->setDefault("cloud_radius", "12");
settings->setDefault("menu_clouds", "true");
settings->setDefault("opaque_water", "false");
+ settings->setDefault("console_height", "1.0");
settings->setDefault("console_color", "(0,0,0)");
settings->setDefault("console_alpha", "200");
settings->setDefault("selectionbox_color", "(0,0,0)");
diff --git a/src/game.cpp b/src/game.cpp
index 4b4597a7a..1cb054cab 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -2627,7 +2627,8 @@ void Game::processKeyInput(VolatileRunFlags *flags,
} else if (wasKeyDown(KeyType::CMD)) {
openConsole(0.2, L"/");
} else if (wasKeyDown(KeyType::CONSOLE)) {
- openConsole(1);
+ openConsole(core::clamp(
+ g_settings->getFloat("console_height"), 0.1f, 1.0f));
} else if (wasKeyDown(KeyType::FREEMOVE)) {
toggleFreeMove(statustext_time);
} else if (wasKeyDown(KeyType::JUMP)) {