Merge branch 'master' into squid-DRY-cursor

DFHack · Feb 10, 2025 · e57b6bc · e57b6bc
2 parents b04307a + 9f5aa0f
commit e57b6bc
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 14 deletions.
diff --git a/Config.cpp b/Config.cpp
@@ -142,15 +142,9 @@ namespace {
         }
         if (line.find("[TRACK_MODE") != string::npos) {
             string result = parseStrFromLine("TRACK_MODE", line);
-            if (result == "CENTER") {
-                config.track_mode = Config::TRACKING_CENTER;
-            }
-            else if (result == "NONE") {
+            if (result == "NONE") {
                 config.track_mode = Config::TRACKING_NONE;
             }
-            else if (result == "FOCUS") {
-                config.track_mode = Config::TRACKING_FOCUS;
-            }
         }
         if (line.find("[INVERT_MOUSE_Z") != string::npos) {
             string result = parseStrFromLine("INVERT_MOUSE_Z", line);

diff --git a/Config.h b/Config.h
@@ -17,8 +17,6 @@ class Config {
     enum trackingmode : uint8_t {
         TRACKING_NONE,
         TRACKING_CENTER,
-        TRACKING_FOCUS,
-        TRACKING_INVALID
     };
 
     bool closeOnEsc = true;
@@ -38,7 +36,7 @@ class Config {
     int lift_segment = 0;
     int animation_step = 196;
     bool verbose_logging = false;
-    trackingmode track_mode = TRACKING_FOCUS;
+    trackingmode track_mode = TRACKING_CENTER;
     bool invert_mouse_z = false;
     bool follow_DFcursor = true;
     bool show_creature_names = false;

diff --git a/MapLoading.cpp b/MapLoading.cpp
@@ -957,9 +957,6 @@ void read_segment( void *arg)
             firstLoad = 0;
             if (stonesenseState.ssConfig.config.track_mode == Config::TRACKING_CENTER) {
                 followCurrentDFCenter();
-            } else if (stonesenseState.ssConfig.config.track_mode == Config::TRACKING_FOCUS) {
-                followCurrentDFFocus();
-                stonesenseState.ssConfig.config.follow_DFcursor = true;
             }
             stonesenseState.ssConfig.zoom = (df::global::gps->viewport_zoom_factor - 64) / 16;
             stonesenseState.ssConfig.recalculateScale();

diff --git a/UserInput.cpp b/UserInput.cpp
@@ -311,7 +311,7 @@ void action_cycletrackingmode(uint32_t keymod)
     }
     else {
         ssConfig.config.track_mode = (Config::trackingmode)(ssConfig.config.track_mode + 1);
-        if (ssConfig.config.track_mode >= Config::TRACKING_INVALID) {
+        if (ssConfig.config.track_mode > Config::TRACKING_CENTER) {
             ssConfig.config.track_mode = Config::TRACKING_NONE;
         }
     }

diff --git a/docs/changelog.txt b/docs/changelog.txt
@@ -46,6 +46,7 @@ Template for new versions:
 - `stonesense`: different types of dig designations (normal, blueprint, autodig) now are distinctly tinted, similar to the vanilla DF interface
 
 ## Removed
+- `stonesense`: removed the "follow DF cursor" tracking mode
 
 # 51.04-r1.1