Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

remapped default look key, removed unused keys

Browse Source
This commit is contained in:
Pfauenauge90 2020-03-27 16:09:51 +01:00
parent 7a3ad54628
commit 11be9c10b2
4 changed files with 3 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
voxygen/src/controller.rs
View File

@ -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);

8
voxygen/src/hud/settings_window.rs
View File

@ -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

6
voxygen/src/settings.rs
View File

@ -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),
}
}
}

6
voxygen/src/window.rs
View File

@ -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);