Skip to content

Commit

Permalink
astyle
Browse files Browse the repository at this point in the history
  • Loading branch information
KorGgenT committed Sep 26, 2019
1 parent 594b054 commit 3905422
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion src/game.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -11263,7 +11263,7 @@ void game::process_artifact( item &it, player &p )
const std::vector<art_effect_passive> &ew = it.type->artifact->effects_wielded;
effects.insert( effects.end(), ew.begin(), ew.end() );
}

if( it.is_tool() ) {
// Recharge it if necessary
if( it.ammo_remaining() < it.ammo_capacity() && calendar::once_every( 1_minutes ) ) {
Expand Down
8 changes: 4 additions & 4 deletions src/item.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -8030,18 +8030,18 @@ void item::process_artifact( player *carrier, const tripoint & /*pos*/ )

void item::process_relic( Character *carrier )
{
if ( !is_relic() ) {
if( !is_relic() ) {
return;
}
std::vector<enchantment> active_enchantments;

for ( const enchantment &ench : get_enchantments() ) {
if ( ench.is_active( *carrier, *this ) ) {
for( const enchantment &ench : get_enchantments() ) {
if( ench.is_active( *carrier, *this ) ) {
active_enchantments.emplace_back( ench );
}
}

for ( const enchantment &ench : active_enchantments ) {
for( const enchantment &ench : active_enchantments ) {
ench.activate_passive( *carrier );
}

Expand Down

0 comments on commit 3905422

Please sign in to comment.