From 538af97d8d0d0a3c50a7092c029d8585079144c4 Mon Sep 17 00:00:00 2001 From: rubenwardy Date: Mon, 4 Jul 2016 18:01:58 +0100 Subject: [PATCH] Remove cinematic toggle on F8 Also update cinematic mode's description to include mouse --- builtin/settingtypes.txt | 4 ++-- minetest.conf.example | 5 ++--- src/defaultsettings.cpp | 2 +- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/builtin/settingtypes.txt b/builtin/settingtypes.txt index 3f256ec4..0b9d29a3 100644 --- a/builtin/settingtypes.txt +++ b/builtin/settingtypes.txt @@ -70,7 +70,7 @@ fast_move (Fast movement) bool false # This requires the "noclip" privilege on the server. noclip (Noclip) bool false -# Smooths camera when moving and looking around. +# Smooths camera when looking around. Also called look or mouse smoothing. # Useful for recording videos. cinematic (Cinematic mode) bool false @@ -178,7 +178,7 @@ keymap_noclip (Noclip key) key KEY_KEY_H # Key for toggling cinematic mode. # See http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735e3da1b0edf72eb3 -keymap_cinematic (Cinematic mode key) key KEY_F8 +keymap_cinematic (Cinematic mode key) key # Key for toggling display of minimap. # See http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735e3da1b0edf72eb3 diff --git a/minetest.conf.example b/minetest.conf.example index 35675dfe..bc0d4c52 100644 --- a/minetest.conf.example +++ b/minetest.conf.example @@ -38,7 +38,7 @@ # type: bool # noclip = false -# Smooths camera when moving and looking around. +# Smooths camera when looking around. Also called look or mouse smoothing. # Useful for recording videos. # type: bool # cinematic = false @@ -162,7 +162,7 @@ # Key for toggling cinematic mode. # See http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735e3da1b0edf72eb3 # type: key -# keymap_cinematic = KEY_F8 +# keymap_cinematic = # Key for toggling display of minimap. # See http://irrlicht.sourceforge.net/docu/namespaceirr.html#a54da2a0e231901735e3da1b0edf72eb3 @@ -1527,4 +1527,3 @@ # type: string # modstore_details_url = https://forum.minetest.net/mmdb/mod/*/ - diff --git a/src/defaultsettings.cpp b/src/defaultsettings.cpp index 8ee26ecf..3220b915 100644 --- a/src/defaultsettings.cpp +++ b/src/defaultsettings.cpp @@ -50,7 +50,7 @@ void set_default_settings(Settings *settings) settings->setDefault("keymap_freemove", "KEY_KEY_K"); settings->setDefault("keymap_fastmove", "KEY_KEY_J"); settings->setDefault("keymap_noclip", "KEY_KEY_H"); - settings->setDefault("keymap_cinematic", "KEY_F8"); + settings->setDefault("keymap_cinematic", ""); settings->setDefault("keymap_screenshot", "KEY_F12"); settings->setDefault("keymap_toggle_hud", "KEY_F1"); settings->setDefault("keymap_toggle_chat", "KEY_F2");