Reversing o-W-g autogems default setting

eswald · eswald · commit 224d29de88f0 · 2016-02-13T21:01:26.000-07:00
Starter pack users have complained that it's too big a change from
vanilla, particularly given that strange moods need rough gems.
diff --git a/plugins/autogems.cpp b/plugins/autogems.cpp
@@ -284,7 +284,7 @@ DFhackCExport command_result plugin_onstatechange(color_ostream &out, state_chan
         if (enabled && World::isFortressMode()) {
             // Determine whether auto gem cutting has been disabled for this fort.
             auto config = World::GetPersistentData(CONFIG_KEY);
-            running = !(config.isValid() && config.ival(0));
+            running = config.isValid() && !config.ival(0);
             last_frame_count = world->frame_counter;
         }
     } else if (event == DFHack::SC_MAP_UNLOADED) {
@@ -302,9 +302,9 @@ DFhackCExport command_result plugin_enable(color_ostream& out, bool enable) {
         }
 
         enabled = enable;
-        running = enabled && World::isFortressMode();
     }
 
+    running = enabled && World::isFortressMode();
     return CR_OK;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -284,7 +284,7 @@ DFhackCExport command_result plugin_onstatechange(color_ostream &out, state_chan`
`284`	`284`	`if (enabled && World::isFortressMode()) {`
`285`	`285`	`// Determine whether auto gem cutting has been disabled for this fort.`
`286`	`286`	`auto config = World::GetPersistentData(CONFIG_KEY);`
`287`		`- running = !(config.isValid() && config.ival(0));`
	`287`	`+ running = config.isValid() && !config.ival(0);`
`288`	`288`	`last_frame_count = world->frame_counter;`
`289`	`289`	`}`
`290`	`290`	`} else if (event == DFHack::SC_MAP_UNLOADED) {`
`@@ -302,9 +302,9 @@ DFhackCExport command_result plugin_enable(color_ostream& out, bool enable) {`
`302`	`302`	`}`
`303`	`303`
`304`	`304`	`enabled = enable;`
`305`		`- running = enabled && World::isFortressMode();`
`306`	`305`	`}`
`307`	`306`
	`307`	`+ running = enabled && World::isFortressMode();`
`308`	`308`	`return CR_OK;`
`309`	`309`	`}`
`310`	`310`