diff --git a/src/mod_tileset.cpp b/src/mod_tileset.cpp index 09c27d76c7a60..3c0fa9a9ef9f3 100644 --- a/src/mod_tileset.cpp +++ b/src/mod_tileset.cpp @@ -24,6 +24,11 @@ void load_mod_tileset( const JsonObject &jsobj, const std::string &, const std:: for( const std::string &compatible_tileset_id : compatibility ) { all_mod_tilesets.back().add_compatible_tileset( compatible_tileset_id ); } + if( jsobj.has_member( "tiles-new" ) ) { + // tiles-new is read when initializing graphics, inside `tileset_loader::load`. + // calling get_array here to suppress warnings in the unit test. + jsobj.get_array( "tiles-new" ); + } } void reset_mod_tileset() diff --git a/src/weather.cpp b/src/weather.cpp index 74e8751d42d85..2cdbac5932c84 100644 --- a/src/weather.cpp +++ b/src/weather.cpp @@ -721,7 +721,7 @@ int get_local_windchill( double temperature, double humidity, double windpower ) // model being designed for reasonable ambient temperature values, // rather than extremely high ones. windchill = 0.33 * std::min( 150.00, humidity / 100.00 * 6.105 * - exp( 17.27 * tmptemp / ( 237.70 + tmptemp ) ) ) - 0.70 * + exp( 17.27 * tmptemp / ( 237.70 + tmptemp ) ) ) - 0.70 * tmpwind - 4.00; // Convert to Fahrenheit, but omit the '+ 32' because we are only dealing with a piece of the felt air temperature equation. windchill = windchill * 9 / 5;