Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Clang-tidy fixes #39562

Merged
merged 2 commits into from
Apr 14, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/advanced_inv.h
Original file line number Diff line number Diff line change
Expand Up @@ -119,9 +119,9 @@ class advanced_inventory
/**
* a smaller chunk of display()
*/
void start_activity( const aim_location destarea, const aim_location srcarea,
void start_activity( aim_location destarea, aim_location srcarea,
advanced_inv_listitem *sitem, int &amount_to_move,
const bool from_vehicle, const bool to_vehicle ) const;
bool from_vehicle, bool to_vehicle ) const;

/**
* returns whether the display loop exits or not
Expand Down Expand Up @@ -160,7 +160,7 @@ class advanced_inventory
* stored in ret), false otherwise.
*/
bool get_square( const std::string &action, aim_location &ret );
void change_square( const aim_location changeSquare, advanced_inventory_pane &dpane,
void change_square( aim_location changeSquare, advanced_inventory_pane &dpane,
advanced_inventory_pane &spane );
/**
* Show the sort-by menu and change the sorting of this pane accordingly.
Expand Down
2 changes: 1 addition & 1 deletion src/newcharacter.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2514,7 +2514,7 @@ tab_direction set_description( avatar &you, const bool allow_reroll,
werase( w_location );
// NOLINTNEXTLINE(cata-use-named-point-constants)
fold_and_print( w_location, point( 0, 1 ), ( TERMX / 2 ), c_light_gray, location_prompt );
mvwprintz( w_location, point( 0, 0 ), c_light_gray, _( "Starting location:" ) );
mvwprintz( w_location, point_zero, c_light_gray, _( "Starting location:" ) );
// ::find will return empty location if id was not found. Debug msg will be printed too.
mvwprintz( w_location, point( utf8_width( _( "Starting location:" ) ) + 1, 0 ),
you.random_start_location ? c_red : c_light_green,
Expand Down