Skip to content

Commit

Permalink
Merge pull request #37120 from CleverRaven/astyle-2020-01-16
Browse files Browse the repository at this point in the history
Fix astyle regression (2020-01-16)
  • Loading branch information
ZhilkinSerg authored Jan 16, 2020
2 parents d61a24f + 3479418 commit 704f045
Showing 1 changed file with 13 additions and 13 deletions.
26 changes: 13 additions & 13 deletions src/handle_action.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -127,19 +127,19 @@ input_context game::get_player_input( std::string &action )
ctxt.set_iso( true );
// The list of allowed actions in death-cam mode in game::handle_action
for( const action_id id : {
ACTION_TOGGLE_MAP_MEMORY,
ACTION_CENTER,
ACTION_SHIFT_N,
ACTION_SHIFT_NE,
ACTION_SHIFT_E,
ACTION_SHIFT_SE,
ACTION_SHIFT_S,
ACTION_SHIFT_SW,
ACTION_SHIFT_W,
ACTION_SHIFT_NW,
ACTION_LOOK,
ACTION_KEYBINDINGS,
} ) {
ACTION_TOGGLE_MAP_MEMORY,
ACTION_CENTER,
ACTION_SHIFT_N,
ACTION_SHIFT_NE,
ACTION_SHIFT_E,
ACTION_SHIFT_SE,
ACTION_SHIFT_S,
ACTION_SHIFT_SW,
ACTION_SHIFT_W,
ACTION_SHIFT_NW,
ACTION_LOOK,
ACTION_KEYBINDINGS,
} ) {
ctxt.register_action( action_ident( id ) );
}
ctxt.register_action( "QUIT", _( "Accept your fate" ) );
Expand Down

0 comments on commit 704f045

Please sign in to comment.