diff --git a/src/effect.cpp b/src/effect.cpp index d70aa7d89b64..4fba4ebd253b 100644 --- a/src/effect.cpp +++ b/src/effect.cpp @@ -1542,7 +1542,7 @@ void caused_effect::load( const JsonObject &jo ) } assign( jo, "inherit_duration", inherit_duration ); if( jo.has_member( "duration" ) && jo.has_member( "inherit_duration" ) ) { - jo.throw_error( "\"duration\" and \"inherit_duration\" can't both be set at the same time." ); + jo.throw_error( R"("duration" and "inherit_duration" can't both be set at the same time.)" ); } if( assign( jo, "intensity", intensity ) ) { @@ -1550,7 +1550,7 @@ void caused_effect::load( const JsonObject &jo ) } assign( jo, "inherit_intensity", inherit_intensity ); if( jo.has_member( "intensity" ) && jo.has_member( "inherit_intensity" ) ) { - jo.throw_error( "\"intensity\" and \"inherit_intensity\" can't both be set at the same time." ); + jo.throw_error( R"("intensity" and "inherit_intensity" can't both be set at the same time.)" ); } if( assign( jo, "body_part", bp ) ) { @@ -1558,7 +1558,7 @@ void caused_effect::load( const JsonObject &jo ) } assign( jo, "inherit_body_part", inherit_body_part ); if( jo.has_member( "intensity" ) && jo.has_member( "inherit_intensity" ) ) { - jo.throw_error( "\"body_part\" and \"inherit_body_part\" can't both be set at the same time." ); + jo.throw_error( R"("body_part" and "inherit_body_part" can't both be set at the same time.)" ); } } diff --git a/src/effect.h b/src/effect.h index 32afd14f495c..127445ca72d1 100644 --- a/src/effect.h +++ b/src/effect.h @@ -64,7 +64,7 @@ struct caused_effect { bodypart_str_id bp = bodypart_str_id::NULL_ID(); bool inherit_body_part = true; - void load_decay( const JsonObject &obj ); + void load_decay( const JsonObject &jo ); auto tie() const { return std::tie( type, intensity_requirement, allow_on_decay, allow_on_remove, @@ -75,7 +75,7 @@ struct caused_effect { return tie() == rhs.tie(); } private: - void load( const JsonObject &obj ); + void load( const JsonObject &jo ); }; diff --git a/src/memorial_logger.cpp b/src/memorial_logger.cpp index 645b10db6d0e..44ebdcdf3934 100644 --- a/src/memorial_logger.cpp +++ b/src/memorial_logger.cpp @@ -44,7 +44,6 @@ #include "type_id.h" #include "units.h" -static const efftype_id effect_adrenaline( "adrenaline" ); static const efftype_id effect_datura( "datura" ); static const efftype_id effect_drunk( "drunk" ); static const efftype_id effect_jetinjector( "jetinjector" ); diff --git a/tests/effects_test.cpp b/tests/effects_test.cpp index edd2af8a1329..e3b70cda3876 100644 --- a/tests/effects_test.cpp +++ b/tests/effects_test.cpp @@ -56,20 +56,20 @@ TEST_CASE( "Effect body part switching and inheritance on decay works as expecte dummy.process_effects(); CHECK( !dummy.has_effect( effect_test_juggling_l1 ) ); CHECK( dummy.has_effect( effect_test_juggling_r1 ) ); - dummy.get_effect( effect_test_juggling_r1 ).get_bp() == body_part_hand_r; + // dummy.get_effect( effect_test_juggling_r1 ).get_bp() == body_part_hand_r; dummy.process_effects(); CHECK( !dummy.has_effect( effect_test_juggling_r1 ) ); CHECK( dummy.has_effect( effect_test_juggling_r2 ) ); - dummy.get_effect( effect_test_juggling_r2 ).get_bp() == body_part_hand_r; + // dummy.get_effect( effect_test_juggling_r2 ).get_bp() == body_part_hand_r; dummy.process_effects(); CHECK( !dummy.has_effect( effect_test_juggling_r2 ) ); CHECK( dummy.has_effect( effect_test_juggling_l2 ) ); - dummy.get_effect( effect_test_juggling_l2 ).get_bp() == body_part_hand_l; + // dummy.get_effect( effect_test_juggling_l2 ).get_bp() == body_part_hand_l; dummy.process_effects(); CHECK( !dummy.has_effect( effect_test_juggling_l2 ) ); CHECK( dummy.has_effect( effect_test_juggling_l1 ) ); - dummy.get_effect( effect_test_juggling_l1 ).get_bp() == body_part_hand_l; + // dummy.get_effect( effect_test_juggling_l1 ).get_bp() == body_part_hand_l; }