Fix a few wrong coordinate conversions that cause generation of meani…

…ngless overmaps (#37581) * Duck-tape ms_to_omt_copy * Duck-tape another ms_to_omt_copy * Fix typo in comments
CleverRaven · Jan 31, 2020 · 1eb07c7 · 1eb07c7
1 parent d3354dd
commit 1eb07c7
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/src/coordinate_conversions.h b/src/coordinate_conversions.h
@@ -49,7 +49,7 @@
 @endcode
  * Functions ending with _copy return the translated coordinates,
  * other functions change the parameters itself and don't return anything.
- * Functions ending with _remain return teh translated coordinates and
+ * Functions ending with _remain return the translated coordinates and
  * store the remainder in the parameters.
  */
 

diff --git a/src/vehicle.cpp b/src/vehicle.cpp
@@ -4583,7 +4583,7 @@ int vehicle::total_solar_epower_w() const
 
 int vehicle::total_wind_epower_w() const
 {
-    const oter_id &cur_om_ter = overmap_buffer.ter( g->m.getabs( global_pos3() ) );
+    const oter_id &cur_om_ter = overmap_buffer.ter( ms_to_omt_copy( g->m.getabs( global_pos3() ) ) );
     const w_point weatherPoint = *g->weather.weather_precise;
     int epower_w = 0;
     for( int part : wind_turbines ) {

diff --git a/src/weather.cpp b/src/weather.cpp
@@ -158,7 +158,7 @@ weather_sum sum_conditions( const time_point &start, const time_point &end,
 
         weather_type wtype = current_weather( location, t );
         proc_weather_sum( wtype, data, t, tick_size );
-        data.wind_amount += get_local_windpower( g->weather.windspeed, overmap_buffer.ter( location ),
+        data.wind_amount += get_local_windpower( g->weather.windspeed, overmap_buffer.ter( ms_to_omt_copy( location ) ),
                             location,
                             g->weather.winddirection, false ) * to_turns<int>( tick_size );
     }