diff --git a/src/cata_tiles.cpp b/src/cata_tiles.cpp index b7683f053fa5c..1de25b27124c4 100644 --- a/src/cata_tiles.cpp +++ b/src/cata_tiles.cpp @@ -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 ); } diff --git a/src/character.cpp b/src/character.cpp index 79859d300a56b..fa0c7e2404678 100644 --- a/src/character.cpp +++ b/src/character.cpp @@ -1239,7 +1239,7 @@ ret_val 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::make_failure( !is_npc() ? _( "Your stamina is too low to attempt to dodge." ) : - _( "'s stamina is too low to attempt to dodge." ) );; + _( "'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 ) { @@ -10058,7 +10058,7 @@ ret_val Character::can_crush_frozen_liquid( item_location const return ret_val::make_success( tool_type ); } else { return ret_val::make_failure( tool_type, - _( "You don't have the tools to crush frozen liquids." ) );; + _( "You don't have the tools to crush frozen liquids." ) ); } } diff --git a/src/crafting_gui.cpp b/src/crafting_gui.cpp index 94e8a13614356..ced21d1f6f1a0 100644 --- a/src/crafting_gui.cpp +++ b/src/crafting_gui.cpp @@ -1547,7 +1547,7 @@ std::pair 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( diff --git a/src/game.cpp b/src/game.cpp index cc9316af9c103..1bc13973b5354 100644 --- a/src/game.cpp +++ b/src/game.cpp @@ -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( 1_seconds ) * 0.2 );; + u.mod_moves( -to_moves( 1_seconds ) * 0.2 ); add_msg( _( "You push past %s blocking the way." ), crit_name ); } } diff --git a/src/iuse.cpp b/src/iuse.cpp index 6dbaaf8f1e3ce..58ef64e436764 100644 --- a/src/iuse.cpp +++ b/src/iuse.cpp @@ -2495,7 +2495,7 @@ std::optional 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 @@ -4555,7 +4555,7 @@ std::optional iuse::blood_draw( Character *p, item *it, const tripoint & ) } if( !drew_blood ) { - return std::nullopt;; + return std::nullopt; } blood.set_item_temperature( blood_temp ); diff --git a/src/mapdata.h b/src/mapdata.h index 433c55f07ec10..a6ed8388b775e 100644 --- a/src/mapdata.h +++ b/src/mapdata.h @@ -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; }; diff --git a/src/npctalk.cpp b/src/npctalk.cpp index de48d0a597261..60efb08675f2f 100644 --- a/src/npctalk.cpp +++ b/src/npctalk.cpp @@ -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,