Skip to content

Commit

Permalink
Add console height setting (#5136)
Browse files Browse the repository at this point in the history
  • Loading branch information
Ezhh authored and Zeno- committed Jan 29, 2017
1 parent 707e27b commit 0c9189d
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 1 deletion.
3 changes: 3 additions & 0 deletions builtin/settingtypes.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
4 changes: 4 additions & 0 deletions minetest.conf.example
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
1 change: 1 addition & 0 deletions src/defaultsettings.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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)");
Expand Down
3 changes: 2 additions & 1 deletion src/game.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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)) {
Expand Down

0 comments on commit 0c9189d

Please sign in to comment.