Skip to content

Commit

Permalink
revert erroneous deletion
Browse files Browse the repository at this point in the history
  • Loading branch information
davidpwbrown committed Oct 20, 2019
1 parent 43359e8 commit 9e102c6
Showing 1 changed file with 9 additions and 8 deletions.
17 changes: 9 additions & 8 deletions src/handle_action.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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();

Expand Down Expand Up @@ -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();
Expand Down Expand Up @@ -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." ) );
}

Expand Down Expand Up @@ -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 );
Expand All @@ -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 );
Expand Down Expand Up @@ -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:
Expand Down

0 comments on commit 9e102c6

Please sign in to comment.