From c0b08540772369f945e52f2ba2311e71a0371420 Mon Sep 17 00:00:00 2001 From: Binrui Dong Date: Sun, 18 Feb 2024 13:09:19 +0800 Subject: [PATCH] Fix compile warnings in MSVC --- src/condition.cpp | 6 +++--- src/itype.cpp | 3 ++- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/condition.cpp b/src/condition.cpp index 49287bf5e0c29..61824a896779d 100644 --- a/src/condition.cpp +++ b/src/condition.cpp @@ -2014,7 +2014,7 @@ std::function conditional_t::get_get_dbl( std::string_view throw std::invalid_argument( "Can't get allies count for NPCs" ); } return []( dialogue const & ) { - return g->allies().size(); + return static_cast( g->allies().size() ); }; } else if( checked_value == "dodge" ) { return [is_npc]( dialogue const & d ) { @@ -2058,12 +2058,12 @@ std::function conditional_t::get_get_dbl( std::string_view } else if( checked_value == "power" ) { return [is_npc]( dialogue const & d ) { // Energy in milijoule - return d.actor( is_npc )->power_cur().value(); + return static_cast( d.actor( is_npc )->power_cur().value() ); }; } else if( checked_value == "power_max" ) { return [is_npc]( dialogue const & d ) { // Energy in milijoule - return d.actor( is_npc )->power_max().value(); + return static_cast( d.actor( is_npc )->power_max().value() ); }; } diff --git a/src/itype.cpp b/src/itype.cpp index 9b070cf301a49..a10171746ed5d 100644 --- a/src/itype.cpp +++ b/src/itype.cpp @@ -430,7 +430,8 @@ int islot_ammo::dispersion_considering_length( units::length barrel_length ) con std::vector> lerp_points; lerp_points.reserve( disp_mod_by_barrels.size() ); for( const disp_mod_by_barrel &b : disp_mod_by_barrels ) { - lerp_points.emplace_back( static_cast( b.barrel_length.value() ), b.dispersion_modifier ); + lerp_points.emplace_back( static_cast( b.barrel_length.value() ), + static_cast( b.dispersion_modifier ) ); } return multi_lerp( lerp_points, barrel_length.value() ) + dispersion; }