From 9e102c677a13348aac17c7c605309a8f626c909d Mon Sep 17 00:00:00 2001 From: davidpwbrown Date: Sun, 20 Oct 2019 11:49:54 +0100 Subject: [PATCH] revert erroneous deletion --- src/handle_action.cpp | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/src/handle_action.cpp b/src/handle_action.cpp index 8ecb1116a676a..c85e026dceb64 100644 --- a/src/handle_action.cpp +++ b/src/handle_action.cpp @@ -306,7 +306,7 @@ input_context game::get_player_input( std::string &action ) if( uquit == QUIT_WATCH ) { query_popup() - .wait_message( c_red, _( "Press %s to accept your fate..." ), ctxt.get_desc( "QUIT" ) ) + .wait_message( c_red, _( "Press %s to accept your fate…" ), ctxt.get_desc( "QUIT" ) ) .on_top( true ) .show(); @@ -370,7 +370,7 @@ static void rcdrive( int dx, int dy ) } else if( !m.add_item_or_charges( dest, *rc_car ).is_null() ) { tripoint src( cx, cy, cz ); //~ Sound of moving a remote controlled car - sounds::sound( src, 6, sounds::sound_t::movement, _( "zzz..." ), true, "misc", "rc_car_drives" ); + sounds::sound( src, 6, sounds::sound_t::movement, _( "zzz…" ), true, "misc", "rc_car_drives" ); u.moves -= 50; m.i_rem( src, rc_car ); car_location_string.clear(); @@ -1066,19 +1066,19 @@ static void loot() if( flags & TillPlots ) { menu.addentry_desc( TillPlots, has_hoe, 't', - has_hoe ? _( "Till farm plots" ) : _( "Till farm plots... you need a tool to dig with" ), + has_hoe ? _( "Till farm plots" ) : _( "Till farm plots… you need a tool to dig with" ), _( "Tills nearby Farm: Plot zones." ) ); } if( flags & PlantPlots ) { menu.addentry_desc( PlantPlots, warm_enough_to_plant( g->u.pos() ) && has_seeds, 'p', - !warm_enough_to_plant( g->u.pos() ) ? _( "Plant seeds... it is too cold for planting" ) : - !has_seeds ? _( "Plant seeds... you don't have any" ) : _( "Plant seeds" ), + !warm_enough_to_plant( g->u.pos() ) ? _( "Plant seeds… it is too cold for planting" ) : + !has_seeds ? _( "Plant seeds… you don't have any" ) : _( "Plant seeds" ), _( "Plant seeds into nearby Farm: Plot zones. Farm plot has to be set to specific plant seed and you must have seeds in your inventory." ) ); } if( flags & FertilizePlots ) { menu.addentry_desc( FertilizePlots, has_fertilizer, 'f', - !has_fertilizer ? _( "Fertilize plots... you don't have any fertilizer" ) : _( "Fertilize plots" ), + !has_fertilizer ? _( "Fertilize plots… you don't have any fertilizer" ) : _( "Fertilize plots" ), _( "Fertilize any nearby Farm: Plot zones." ) ); } @@ -1344,7 +1344,7 @@ static void fire() reach_attack( range, u ); } else { u.moves -= rng( 2, 8 ) * 10; - add_msg( m_bad, _( "You're too pacified to strike anything..." ) ); + add_msg( m_bad, _( "You're too pacified to strike anything…" ) ); } } else { reach_attack( range, u ); @@ -1357,7 +1357,7 @@ static void fire() reach_attack( range, u ); } else { u.moves -= rng( 2, 8 ) * 10; - add_msg( m_bad, _( "You're too pacified to strike anything..." ) ); + add_msg( m_bad, _( "You're too pacified to strike anything…" ) ); } } else { reach_attack( range, u ); @@ -2280,6 +2280,7 @@ bool game::handle_action() if( MAP_SHARING::isCompetitive() && !MAP_SHARING::isDebugger() ) { break; //don't do anything when sharing and not debugger } + debug_menu::debug(); break; case ACTION_TOGGLE_FULLSCREEN: