Skip to content

Commit

Permalink
Merge branch 'boringfood2' of https://github.com/Soadreqm/Cataclysm-DDA
Browse files Browse the repository at this point in the history
… into boringfood2
  • Loading branch information
Soadreqm committed Mar 22, 2020
2 parents 81471ee + 56e609c commit 1c043d2
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions src/item_factory.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1851,7 +1851,7 @@ void Item_factory::load( islot_comestible &slot, const JsonObject &jo, const std
float specific_heat_liquid = 0;
float latent_heat = 0;

for( std::string m : jo.get_tags( "material" ) ) {
for( const std::string &m : jo.get_tags( "material" ) ) {
specific_heat_solid += material_id( m )->specific_heat_solid();
specific_heat_liquid += material_id( m )->specific_heat_liquid();
latent_heat += material_id( m )->latent_heat();
Expand All @@ -1868,7 +1868,7 @@ void Item_factory::load( islot_comestible &slot, const JsonObject &jo, const std
is_not_boring = is_not_boring || mat == "junk";
}
if( jo.has_member( "material" ) ) {
for( std::string m : jo.get_tags( "material" ) ) {
for( const std::string &m : jo.get_tags( "material" ) ) {
is_not_boring = is_not_boring || m == "junk";
}
}
Expand Down

0 comments on commit 1c043d2

Please sign in to comment.