Skip to content

Commit

Permalink
astyle
Browse files Browse the repository at this point in the history
  • Loading branch information
dpwb committed Apr 3, 2020
1 parent 838f8bc commit 4d7c45a
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 2 deletions.
3 changes: 2 additions & 1 deletion src/activity_handlers.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -4875,7 +4875,8 @@ void activity_handlers::spellcasting_finish( player_activity *act, player *p )
spell_being_cast.xp() );
}
if( spell_being_cast.get_level() != old_level ) {
g->events().send<event_type::player_levels_spell>( spell_being_cast.id(), spell_being_cast.get_level() );
g->events().send<event_type::player_levels_spell>( spell_being_cast.id(),
spell_being_cast.get_level() );
}
}
}
Expand Down
1 change: 1 addition & 0 deletions src/activity_item_handling.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,7 @@ static const activity_id ACT_VEHICLE( "ACT_VEHICLE" );
static const activity_id ACT_VEHICLE_DECONSTRUCTION( "ACT_VEHICLE_DECONSTRUCTION" );
static const activity_id ACT_VEHICLE_REPAIR( "ACT_VEHICLE_REPAIR" );
static const efftype_id effect_pet( "pet" );
static const efftype_id effect_nausea( "nausea" );

static const trap_str_id tr_firewood_source( "tr_firewood_source" );
static const trap_str_id tr_unfinished_construction( "tr_unfinished_construction" );
Expand Down
3 changes: 2 additions & 1 deletion src/iuse_actor.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1968,7 +1968,8 @@ int enzlave_actor::use( player &p, item &it, bool t, const tripoint & ) const

for( item &corpse_candidate : items ) {
const mtype *mt = corpse_candidate.get_mtype();
if( corpse_candidate.is_corpse() && mt->in_species( ZOMBIE ) && mt->made_of( material_id( "flesh" ) ) &&
if( corpse_candidate.is_corpse() && mt->in_species( ZOMBIE ) &&
mt->made_of( material_id( "flesh" ) ) &&
mt->in_species( HUMAN ) && corpse_candidate.active && !corpse_candidate.has_var( "zlave" ) ) {
corpses.push_back( &corpse_candidate );
}
Expand Down

0 comments on commit 4d7c45a

Please sign in to comment.