diff --git a/src/character.cpp b/src/character.cpp index 2590d13b8d2ba..68fc2bc8a1ab9 100644 --- a/src/character.cpp +++ b/src/character.cpp @@ -7336,7 +7336,7 @@ bool Character::invoke_item( item *used, const std::string &method, const tripoi add_msg_if_player( m_info, string_format( "Attempting to eat %s", actually_used->display_name() ) ); assign_activity( consume_activity_actor( item_location( *this, actually_used ) ) ); // If the character isn't eating, then invoking the item failed somewhere - return ( !activity.is_null() ); + return !activity.is_null(); } std::optional charges_used = actually_used->type->invoke( this, *actually_used, diff --git a/tests/eoc_test.cpp b/tests/eoc_test.cpp index c5bfe8d5e2149..d4be1fa4b3ead 100644 --- a/tests/eoc_test.cpp +++ b/tests/eoc_test.cpp @@ -45,10 +45,10 @@ effect_on_condition_EOC_martial_art_test_1( "EOC_martial_art_test_1" ); static const effect_on_condition_id effect_on_condition_EOC_martial_art_test_2( "EOC_martial_art_test_2" ); static const effect_on_condition_id -effect_on_condition_EOC_math_addiction_setup( "EOC_math_addiction_setup" ); -static const effect_on_condition_id effect_on_condition_EOC_math_addiction_check( "EOC_math_addiction_check" ); static const effect_on_condition_id +effect_on_condition_EOC_math_addiction_setup( "EOC_math_addiction_setup" ); +static const effect_on_condition_id effect_on_condition_EOC_math_armor( "EOC_math_armor" ); static const effect_on_condition_id effect_on_condition_EOC_math_diag_assign( "EOC_math_diag_assign" );