Skip to content

Commit

Permalink
Merge pull request NebulaSS13#4127 from out-of-phaze/tweak/default-di…
Browse files Browse the repository at this point in the history
…agonal

Make diagonal movement on by default
  • Loading branch information
MistakeNot4892 authored Jun 21, 2024
2 parents b9133ff + 6297725 commit e64a30b
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions code/datums/config/config_types/config_game_option.dm
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
/decl/config/num/default_darksight_effectiveness,
/decl/config/toggle/grant_default_darksight,
/decl/config/num/expected_round_length,
/decl/config/toggle/allow_diagonal_movement,
/decl/config/toggle/on/allow_diagonal_movement,
/decl/config/toggle/expanded_alt_interactions,
/decl/config/toggle/ert_admin_call_only,
/decl/config/toggle/ghosts_can_possess_animals,
Expand Down Expand Up @@ -134,7 +134,7 @@
uid = "grant_default_darksight"
desc = "Whether or not all human mobs have very basic darksight by default."

/decl/config/toggle/allow_diagonal_movement
/decl/config/toggle/on/allow_diagonal_movement
uid = "allow_diagonal_movement"
desc = "Allow multiple input keys to be pressed for diagonal movement."

Expand Down
2 changes: 1 addition & 1 deletion code/modules/keybindings/bindings_atom.dm
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
if((movement_dir & EAST) && (movement_dir & WEST))
movement_dir &= ~(EAST|WEST)

if(!get_config_value(/decl/config/toggle/allow_diagonal_movement))
if(!get_config_value(/decl/config/toggle/on/allow_diagonal_movement))
if(movement_dir & user.last_move_dir_pressed)
movement_dir = user.last_move_dir_pressed
else
Expand Down
2 changes: 1 addition & 1 deletion code/modules/keybindings/bindings_client.dm
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
if(!(next_move_dir_sub & movement))
next_move_dir_add |= movement

if(movement && !get_config_value(/decl/config/toggle/allow_diagonal_movement))
if(movement && !get_config_value(/decl/config/toggle/on/allow_diagonal_movement))
last_move_dir_pressed = movement

// Client-level keybindings are ones anyone should be able to do at any time
Expand Down

0 comments on commit e64a30b

Please sign in to comment.