Skip to content

Commit 3d07400

Browse files
Silence data loss warning (#82686)
* Silence data loss warning * Improvements
1 parent 2da5461 commit 3d07400

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

src/item_factory.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3410,7 +3410,7 @@ void islot_comestible::deserialize( const JsonObject &jo )
34103410
optional( jo, was_loaded, "calories", default_nutrition.calories );
34113411

34123412
optional( jo, was_loaded, "contamination", contamination,
3413-
weighted_string_id_reader<diseasetype_id, float> {1.0} );
3413+
weighted_string_id_reader<diseasetype_id, float> { 1.0f } );
34143414
optional( jo, was_loaded, "primary_material", primary_material, material_id::NULL_ID() );
34153415
optional( jo, was_loaded, "vitamins", default_nutrition.vitamins_,
34163416
vitamins_reader {} );

src/material.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ void material_type::load( const JsonObject &jsobj, std::string_view )
112112
optional( jsobj, was_loaded, "soft", _soft, false );
113113
optional( jsobj, was_loaded, "uncomfortable", _uncomfortable, false );
114114

115-
optional( jsobj, was_loaded, "vitamins", _vitamins, weighted_string_id_reader<vitamin_id, double> { 1 } );
115+
optional( jsobj, was_loaded, "vitamins", _vitamins, weighted_string_id_reader<vitamin_id, double> { 1.0 } );
116116

117117
mandatory( jsobj, was_loaded, "bash_dmg_verb", _bash_dmg_verb );
118118
mandatory( jsobj, was_loaded, "cut_dmg_verb", _cut_dmg_verb );

0 commit comments

Comments
 (0)