Merge pull request CleverRaven#49025 from ZhilkinSerg/fix-wind

Fix wind update
AMurkin · May 25, 2021 · 39074ba · 39074ba
2 parents b6c4ce5 + 0a130e4
commit 39074ba
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/src/weather.cpp b/src/weather.cpp
@@ -1048,11 +1048,11 @@ const weather_generator &weather_manager::get_cur_weather_gen() const
 
 void weather_manager::update_weather()
 {
-    w_point &w = *weather_precise;
-    winddirection = wind_direction_override ? *wind_direction_override : w.winddirection;
-    windspeed = windspeed_override ? *windspeed_override : w.windpower;
+    winddirection = wind_direction_override ? *wind_direction_override : winddirection;
+    windspeed = windspeed_override ? *windspeed_override : windspeed;
     Character &player_character = get_player_character();
     if( weather_id == WEATHER_NULL || calendar::turn >= nextweather ) {
+        w_point &w = *weather_precise;
         const weather_generator &weather_gen = get_cur_weather_gen();
         w = weather_gen.get_weather( player_character.global_square_location(), calendar::turn,
                                      g->get_seed() );