From 11be9c10b2b7b7d474a596a2422c2f91a17e2954 Mon Sep 17 00:00:00 2001
From: Pfauenauge90 <44173739+Pfauenauge90@users.noreply.github.com>
Date: Fri, 27 Mar 2020 16:09:51 +0100
Subject: [PATCH] remapped default look key, removed unused keys

---
 voxygen/src/controller.rs          | 6 ------
 voxygen/src/hud/settings_window.rs | 8 ++------
 voxygen/src/settings.rs            | 6 +-----
 voxygen/src/window.rs              | 6 ------
 4 files changed, 3 insertions(+), 23 deletions(-)

diff --git a/voxygen/src/controller.rs b/voxygen/src/controller.rs
index 2e6f8d8d3c..6fe0d76260 100644
--- a/voxygen/src/controller.rs
+++ b/voxygen/src/controller.rs
@@ -115,12 +115,6 @@ impl From<&crate::settings::GamepadSettings> for ControllerSettings {
                 map.entry(settings.game_buttons.bag)
                     .or_default()
                     .push(GameInput::Bag);
-                map.entry(settings.game_buttons.quest_log)
-                    .or_default()
-                    .push(GameInput::QuestLog);
-                map.entry(settings.game_buttons.character_window)
-                    .or_default()
-                    .push(GameInput::CharacterWindow);
                 map.entry(settings.game_buttons.social)
                     .or_default()
                     .push(GameInput::Social);
diff --git a/voxygen/src/hud/settings_window.rs b/voxygen/src/hud/settings_window.rs
index 1c63978804..5101819761 100644
--- a/voxygen/src/hud/settings_window.rs
+++ b/voxygen/src/hud/settings_window.rs
@@ -1358,8 +1358,6 @@ impl<'a> Widget for SettingsWindow<'a> {
                  {}\n\
                  {}\n\
                  {}\n\
-                 {}\n\
-                 {}\n\
                  \n\
                  \n\
                  \n\
@@ -1369,8 +1367,6 @@ impl<'a> Widget for SettingsWindow<'a> {
                  \n\
                  \n\
                  \n\
-                 \n\
-                 \n\
                  ",
                 controls.toggle_cursor,
                 controls.help,
@@ -1412,8 +1408,8 @@ impl<'a> Widget for SettingsWindow<'a> {
                 controls.social,
                 controls.map,
                 controls.spellbook,
-                controls.character_window,
-                controls.quest_log,
+                //controls.character_window,
+                //controls.quest_log,
                 controls.bag,
                 controls.enter,
                 "Mouse Wheel", // Scroll chat
diff --git a/voxygen/src/settings.rs b/voxygen/src/settings.rs
index db290d764d..85c4f8fba0 100644
--- a/voxygen/src/settings.rs
+++ b/voxygen/src/settings.rs
@@ -36,8 +36,6 @@ pub struct ControlSettings {
     pub mount: KeyMouse,
     pub map: KeyMouse,
     pub bag: KeyMouse,
-    pub quest_log: KeyMouse,
-    pub character_window: KeyMouse,
     pub social: KeyMouse,
     pub spellbook: KeyMouse,
     pub settings: KeyMouse,
@@ -89,8 +87,6 @@ impl Default for ControlSettings {
             mount: KeyMouse::Key(VirtualKeyCode::F),
             map: KeyMouse::Key(VirtualKeyCode::M),
             bag: KeyMouse::Key(VirtualKeyCode::B),
-            quest_log: KeyMouse::Key(VirtualKeyCode::L),
-            character_window: KeyMouse::Key(VirtualKeyCode::C),
             social: KeyMouse::Key(VirtualKeyCode::O),
             spellbook: KeyMouse::Key(VirtualKeyCode::P),
             settings: KeyMouse::Key(VirtualKeyCode::N),
@@ -106,7 +102,7 @@ impl Default for ControlSettings {
             toggle_wield: KeyMouse::Key(VirtualKeyCode::T),
             swap_loadout: KeyMouse::Key(VirtualKeyCode::Q),
             charge: KeyMouse::Key(VirtualKeyCode::Key1),
-            free_look: KeyMouse::Key(VirtualKeyCode::LAlt),
+            free_look: KeyMouse::Key(VirtualKeyCode::L),
         }
     }
 }
diff --git a/voxygen/src/window.rs b/voxygen/src/window.rs
index 03db7074cc..f54e0eabf1 100644
--- a/voxygen/src/window.rs
+++ b/voxygen/src/window.rs
@@ -416,12 +416,6 @@ impl Window {
         map.entry(settings.controls.bag)
             .or_default()
             .push(GameInput::Bag);
-        map.entry(settings.controls.quest_log)
-            .or_default()
-            .push(GameInput::QuestLog);
-        map.entry(settings.controls.character_window)
-            .or_default()
-            .push(GameInput::CharacterWindow);
         map.entry(settings.controls.social)
             .or_default()
             .push(GameInput::Social);