Add console height setting (#5136)

minetest · Jan 29, 2017 · 0c9189d · 0c9189d
1 parent 707e27b
commit 0c9189d
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 1 deletion.
diff --git a/builtin/settingtypes.txt b/builtin/settingtypes.txt
@@ -477,6 +477,9 @@ fall_bobbing_amount (Fall bobbing) float 0.0
 #    -    pageflip: quadbuffer based 3d.
 3d_mode (3D mode) enum none none,anaglyph,interlaced,topbottom,sidebyside,pageflip
 
+#    In-game chat console height, between 0.1 (10%) and 1.0 (100%).
+console_height (Console height) float 1.0 0.1 1.0
+
 #    In-game chat console background color (R,G,B).
 console_color (Console color) string (0,0,0)
 

diff --git a/minetest.conf.example b/minetest.conf.example
@@ -548,6 +548,10 @@
 #    type: enum values: none, anaglyph, interlaced, topbottom, sidebyside, pageflip
 # 3d_mode = none
 
+#    In-game chat console height, between 0.1 (10%) and 1.0 (100%).
+#    type: float
+# console_height = 1.0
+
 #    In-game chat console background color (R,G,B).
 #    type: string
 # console_color = (0,0,0)

diff --git 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
@@ -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)) {