From 4d7c45a2c0c0f14c372a7d688c11c891a1c82ddd Mon Sep 17 00:00:00 2001 From: dpwb Date: Fri, 3 Apr 2020 14:21:11 +0100 Subject: [PATCH] astyle --- src/activity_handlers.cpp | 3 ++- src/activity_item_handling.cpp | 1 + src/iuse_actor.cpp | 3 ++- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/activity_handlers.cpp b/src/activity_handlers.cpp index 170501fb13aec..e8ed3c853e0fc 100644 --- a/src/activity_handlers.cpp +++ b/src/activity_handlers.cpp @@ -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( spell_being_cast.id(), spell_being_cast.get_level() ); + g->events().send( spell_being_cast.id(), + spell_being_cast.get_level() ); } } } diff --git a/src/activity_item_handling.cpp b/src/activity_item_handling.cpp index 5dd1d8b2756db..08d67b8e08a07 100644 --- a/src/activity_item_handling.cpp +++ b/src/activity_item_handling.cpp @@ -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" ); diff --git a/src/iuse_actor.cpp b/src/iuse_actor.cpp index 9fc9a83afbec8..4d6f9021e738f 100644 --- a/src/iuse_actor.cpp +++ b/src/iuse_actor.cpp @@ -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 ); }