Merge remote-tracking branch 'PatrikLundell/embark-assistant' into de…

…velop
abstern · Dec 28, 2020 · a4ac11c · a4ac11c
2 parents 4460584 + 58a4dbe
commit a4ac11c
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/docs/changelog.txt b/docs/changelog.txt
@@ -33,6 +33,9 @@ changelog.txt uses a syntax similar to RST, with a few special sequences:
 
 # Future
 
+## Fixes
+- `embark-assistant`: fixed order of factors when calculating min temperature
+
 # 0.47.04-r4
 
 ## Fixes

diff --git a/plugins/embark-assistant/survey.cpp b/plugins/embark-assistant/survey.cpp
@@ -432,17 +432,17 @@ namespace embark_assist {
             }
 
             if (world->world_data->world_height == 17) {
-                divisor = (57 / steps * lat + 0.4);
+                divisor = ((lat * 57) / steps + 0.4);
             }
             else if (world->world_data->world_height == 33) {
-                divisor = (61 / steps * lat + 0.1);
+                divisor = ((lat * 61) / steps + 0.1);
             }
             else if (world->world_data->world_height == 65) {
-                divisor = (63 / steps * lat);
+                divisor = ((lat * 63) / steps);
             }
             else if (world->world_data->world_height == 129 ||
                 world->world_data->world_height == 257) {
-                divisor = (64 / steps * lat);
+                divisor = ((lat * 64) / steps);
             }
             else {
                 return max_temperature; // Not any standard world height. No formula available