From 0c9189d10989f85cd5148107b643dc17a49c06ff Mon Sep 17 00:00:00 2001
From: Ezhh <owlecho@live.com>
Date: Sun, 29 Jan 2017 16:10:17 +0000
Subject: Add console height setting (#5136)

---
 src/defaultsettings.cpp | 1 +
 src/game.cpp            | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

(limited to 'src')

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)) {
-- 
cgit v1.2.3