Skip to content

Commit

Permalink
Merge pull request #77702 from Procyonae/;;
Browse files Browse the repository at this point in the history
Remove spurious double semi colons
  • Loading branch information
Night-Pryanik authored Nov 9, 2024
2 parents b8793ea + fc3c8f6 commit a05e593
Show file tree
Hide file tree
Showing 7 changed files with 9 additions and 9 deletions.
2 changes: 1 addition & 1 deletion src/cata_tiles.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -3552,7 +3552,7 @@ bool cata_tiles::draw_part_con( const tripoint &p, const lit_level ll, int &heig
// FIXME: fix tripoint type
if( here.partial_con_at( tripoint_bub_ms( p ) ) != nullptr && !invisible[0] ) {
avatar &you = get_avatar();
std::string const &trname = tr_unfinished_construction.str();;
std::string const &trname = tr_unfinished_construction.str();
if( here.memory_cache_dec_is_dirty( p ) ) {
you.memorize_decoration( here.getglobal( p ), trname, 0, 0 );
}
Expand Down
4 changes: 2 additions & 2 deletions src/character.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1239,7 +1239,7 @@ ret_val<void> Character::can_try_dodge( bool ignore_dodges_left ) const
add_msg_debug( debugmode::DF_MELEE, "Stamina dodge modifier: %f", get_stamina_dodge_modifier() );
return ret_val<void>::make_failure( !is_npc() ? _( "Your stamina is too low to attempt to dodge." )
:
_( "<npcname>'s stamina is too low to attempt to dodge." ) );;
_( "<npcname>'s stamina is too low to attempt to dodge." ) );
}
// Ensure no attempt to dodge without sources of extra dodges, eg martial arts
if( get_dodges_left() <= 0 && !ignore_dodges_left ) {
Expand Down Expand Up @@ -10058,7 +10058,7 @@ ret_val<crush_tool_type> Character::can_crush_frozen_liquid( item_location const
return ret_val<crush_tool_type>::make_success( tool_type );
} else {
return ret_val<crush_tool_type>::make_failure( tool_type,
_( "You don't have the tools to crush frozen liquids." ) );;
_( "You don't have the tools to crush frozen liquids." ) );
}
}

Expand Down
2 changes: 1 addition & 1 deletion src/crafting_gui.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1547,7 +1547,7 @@ std::pair<Character *, const recipe *> select_crafter_and_crafting_recipe( int &
w_iteminfo ) ).apply( w_iteminfo );
wnoutrefresh( w_iteminfo );
} else if( cur_recipe->is_nested() ) {
std::string desc = cur_recipe->description.translated() + "\n\n";;
std::string desc = cur_recipe->description.translated() + "\n\n";
desc += list_nested( *crafter, cur_recipe, available_recipes );
fold_and_print( w_iteminfo, point_zero, item_info_width, c_light_gray, desc );
scrollbar().offset_x( item_info_width - 1 ).offset_y( 0 ).content_size( 1 ).viewport_size( getmaxy(
Expand Down
2 changes: 1 addition & 1 deletion src/game.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -12375,7 +12375,7 @@ void game::vertical_move( int movez, bool force, bool peeking )
}
if( player_displace ) {
u.setpos( *displace );
u.mod_moves( -to_moves<int>( 1_seconds ) * 0.2 );;
u.mod_moves( -to_moves<int>( 1_seconds ) * 0.2 );
add_msg( _( "You push past %s blocking the way." ), crit_name );
}
}
Expand Down
4 changes: 2 additions & 2 deletions src/iuse.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2495,7 +2495,7 @@ std::optional<int> iuse::purify_water( Character *p, item *purifier, item_locati
if( available * max_water_per_tablet >= charges_of_water ) {
int to_consume = std::ceil( to_consume_f );
p->add_msg_if_player( m_info, _( "Purifying %i water using %i %s" ), charges_of_water, to_consume,
purifier->tname( to_consume ) );;
purifier->tname( to_consume ) );
// Pull from surrounding map first because it will update to_consume
get_map().use_amount( p->pos_bub(), PICKUP_RANGE, itype_pur_tablets, to_consume );
// Then pull from inventory
Expand Down Expand Up @@ -4555,7 +4555,7 @@ std::optional<int> iuse::blood_draw( Character *p, item *it, const tripoint & )
}

if( !drew_blood ) {
return std::nullopt;;
return std::nullopt;
}

blood.set_item_temperature( blood_temp );
Expand Down
2 changes: 1 addition & 1 deletion src/mapdata.h
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ struct map_ter_bash_info : map_common_bash_info {
};
struct map_furn_bash_info : map_common_bash_info {
furn_str_id furn_set; // furniture to set (only used by furniture, not terrain)
map_furn_bash_info() = default;;
map_furn_bash_info() = default;
void load( const JsonObject &jo, bool was_loaded, const std::string &context );
void check( const std::string &id ) const;
};
Expand Down
2 changes: 1 addition & 1 deletion src/npctalk.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -5135,7 +5135,7 @@ talk_effect_fun_t::func f_attack( const JsonObject &jo, std::string_view member,
{
str_or_var force_technique = get_str_or_var( jo.get_member( member ), member, true );
bool allow_special = jo.get_bool( "allow_special", true );
bool allow_unarmed = jo.get_bool( "allow_unarmed", true );;
bool allow_unarmed = jo.get_bool( "allow_unarmed", true );
dbl_or_var forced_movecost = get_dbl_or_var( jo, "forced_movecost", false, -1.0 );

return [is_npc, allow_special, force_technique, allow_unarmed,
Expand Down

0 comments on commit a05e593

Please sign in to comment.