diff --git a/src/advanced_inv.h b/src/advanced_inv.h index b32973718c2ef..5319f01eeeeff 100644 --- a/src/advanced_inv.h +++ b/src/advanced_inv.h @@ -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 @@ -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. diff --git a/src/newcharacter.cpp b/src/newcharacter.cpp index 27781607f2299..1453815d2d23f 100644 --- a/src/newcharacter.cpp +++ b/src/newcharacter.cpp @@ -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,