Merge pull request CleverRaven#67868 from dseguin/appease_clang_tidy

Misc clang-tidy fixes
OrenAudeles · Aug 25, 2023 · f5fe4d9 · f5fe4d9
2 parents 9b54ac2 + 87ff687
commit f5fe4d9
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/src/map_extras.cpp b/src/map_extras.cpp
@@ -79,7 +79,6 @@ static const item_group_id Item_spawn_data_trash_cart( "trash_cart" );
 
 static const itype_id itype_223_casing( "223_casing" );
 static const itype_id itype_762_51_casing( "762_51_casing" );
-static const itype_id itype_9mm_casing( "9mm_casing" );
 static const itype_id itype_acoustic_guitar( "acoustic_guitar" );
 static const itype_id itype_ash( "ash" );
 static const itype_id itype_bag_canvas( "bag_canvas" );

diff --git a/src/npcmove.cpp b/src/npcmove.cpp
@@ -606,7 +606,7 @@ void npc::assess_danger()
     }
     // being outnumbered is serious.  Scale up your assessment if you're outnumbered.
     if( hostile_count > friendly_count ) {
-        assessment *= ( hostile_count / friendly_count );
+        assessment *= ( hostile_count / static_cast<float>( friendly_count ) );
     }
 
     const auto handle_hostile = [&]( const Character & foe, float foe_threat,