Fix #487: Checkbox behaviour reversed for industry opening/closing. (#…

…490)
OpenLoco · May 25, 2020 · cf49dfa · cf49dfa
1 parent d0a53d5
commit cf49dfa
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,6 @@
 20.05+ (???)
 ------------------------------------------------------------------------
+- Fix: [#487] Checkbox behaviour reversed for industry opening/closing in landscape generation options.
 - Fix: [#488] Repeated clicking may lead to a negative loan.
 
 20.05 (2020-05-24)

diff --git a/src/openloco/scenario.h b/src/openloco/scenario.h
@@ -12,8 +12,8 @@ namespace openloco::scenario
 
     enum industry_flags
     {
-        allow_industries_close_down = (1 << 0),
-        allow_industries_start_up = (1 << 1),
+        disallow_industries_close_down = (1 << 0),
+        disallow_industries_start_up = (1 << 1),
     };
 
     enum objective_flags : uint8_t

diff --git a/src/openloco/windows/LandscapeGeneration.cpp b/src/openloco/windows/LandscapeGeneration.cpp
@@ -1160,12 +1160,12 @@ namespace openloco::ui::windows::LandscapeGeneration
                     break;
 
                 case widx::check_allow_industries_close_down:
-                    *industryFlags ^= scenario::industry_flags::allow_industries_close_down;
+                    *industryFlags ^= scenario::industry_flags::disallow_industries_close_down;
                     window->invalidate();
                     break;
 
                 case widx::check_allow_industries_start_up:
-                    *industryFlags ^= scenario::industry_flags::allow_industries_start_up;
+                    *industryFlags ^= scenario::industry_flags::disallow_industries_start_up;
                     window->invalidate();
                     break;
             }
@@ -1179,9 +1179,9 @@ namespace openloco::ui::windows::LandscapeGeneration
             widgets[widx::num_industries].text = numIndustriesLabels[s5::getOptions().numberOfIndustries];
 
             window->activated_widgets &= ~((1 << widx::check_allow_industries_close_down) | (1 << widx::check_allow_industries_start_up));
-            if (industryFlags & scenario::industry_flags::allow_industries_close_down)
+            if (!(industryFlags & scenario::industry_flags::disallow_industries_close_down))
                 window->activated_widgets |= 1 << widx::check_allow_industries_close_down;
-            if (industryFlags & scenario::industry_flags::allow_industries_start_up)
+            if (!(industryFlags & scenario::industry_flags::disallow_industries_start_up))
                 window->activated_widgets |= 1 << widx::check_allow_industries_start_up;
         }