Skip to content

Commit

Permalink
Run astyle
Browse files Browse the repository at this point in the history
  • Loading branch information
Joshua-Chin committed Sep 3, 2021
1 parent 401809c commit b525b22
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 7 deletions.
9 changes: 5 additions & 4 deletions src/monster.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1496,10 +1496,11 @@ void monster::absorb_hit( const bodypart_id &, damage_instance &dam )
for( auto &elem : dam.damage_units ) {
add_msg_debug( debugmode::DF_MONSTER, "Dam Type: %s :: Ar Pen: %.1f :: Armor Mult: %.1f",
name_by_dt( elem.type ), elem.res_pen, elem.res_mult );
add_msg_debug( debugmode::DF_MONSTER, "Weakpoint: %s :: Armor Mult: %.1f :: Armor Offset: %.1f :: Resist: %.1f",
weakpoint->id, weakpoint->armor_mult[static_cast<int>(elem.type)],
weakpoint->armor_offset[static_cast<int>(elem.type)],
r.get_effective_resist( elem ));
add_msg_debug( debugmode::DF_MONSTER,
"Weakpoint: %s :: Armor Mult: %.1f :: Armor Offset: %.1f :: Resist: %.1f",
weakpoint->id, weakpoint->armor_mult[static_cast<int>( elem.type )],
weakpoint->armor_offset[static_cast<int>( elem.type )],
r.get_effective_resist( elem ) );
elem.amount -= std::min( r.get_effective_resist( elem ) +
get_worn_armor_val( elem.type ), elem.amount );
}
Expand Down
2 changes: 0 additions & 2 deletions src/weakpoint.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,6 @@ float weakpoint::hit_chance() const
return coverage;
}

weakpoints::weakpoints() {}

const weakpoint *weakpoints::select_weakpoint() const
{
float idx = rng_float( 0.0f, 1.0f );
Expand Down
1 change: 0 additions & 1 deletion src/weakpoint.h
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@ struct weakpoints {
// Selects a weakpoint to hit.
const weakpoint *select_weakpoint( ) const;

weakpoints();
void clear();
void load( const JsonArray &ja );
};
Expand Down

0 comments on commit b525b22

Please sign in to comment.