fixed sidebar mode numbering.

plugins/proto/ui_sidebar_mode.proto

@@ -5,59 +5,59 @@ option optimize_for = LITE_RUNTIME;
 
 enum ui_sidebar_mode
 {
-    Default = 1;
-    Squads = 2;
-    DesignateMine = 3;
-    DesignateRemoveRamps = 4;
-    DesignateUpStair = 5;
-    DesignateDownStair = 6;
-    DesignateUpDownStair = 7;
-    DesignateUpRamp = 8;
-    DesignateChannel = 9;
-    DesignateGatherPlants = 10;
-    DesignateRemoveDesignation = 11;
-    DesignateSmooth = 12;
-    DesignateCarveTrack = 13;
-    DesignateEngrave = 14;
-    DesignateCarveFortification = 15;
-    Stockpiles = 16;
-    Build = 17;
-    QueryBuilding = 18;
-    Orders = 19;
-    OrdersForbid = 20;
-    OrdersRefuse = 21;
-    OrdersWorkshop = 22;
-    OrdersZone = 23;
-    BuildingItems = 24;
-    ViewUnits = 25;
-    LookAround = 26;
-    DesignateItemsClaim = 27;
-    DesignateItemsForbid = 28;
-    DesignateItemsMelt = 29;
-    DesignateItemsUnmelt = 30;
-    DesignateItemsDump = 31;
-    DesignateItemsUndump = 32;
-    DesignateItemsHide = 33;
-    DesignateItemsUnhide = 34;
-    DesignateChopTrees = 35;
-    DesignateToggleEngravings = 36;
-    DesignateToggleMarker = 37;
-    Hotkeys = 38;
-    DesignateTrafficHigh = 39;
-    DesignateTrafficNormal = 40;
-    DesignateTrafficLow = 41;
-    DesignateTrafficRestricted = 42;
-    Zones = 43;
-    ZonesPenInfo = 44;
-    ZonesPitInfo = 45;
-    ZonesHospitalInfo = 46;
-    ZonesGatherInfo = 47;
-    DesignateRemoveConstruction = 48;
-    DepotAccess = 49;
-    NotesPoints = 50;
-    NotesRoutes = 51;
-    Burrows = 52;
-    Hauling = 53;
-    ArenaWeather = 54;
-    ArenaTrees = 55;
+    Default = 0;
+    Squads = 1;
+    DesignateMine = 2;
+    DesignateRemoveRamps = 3;
+    DesignateUpStair = 4;
+    DesignateDownStair = 5;
+    DesignateUpDownStair = 6;
+    DesignateUpRamp = 7;
+    DesignateChannel = 8;
+    DesignateGatherPlants = 9;
+    DesignateRemoveDesignation = 10;
+    DesignateSmooth = 11;
+    DesignateCarveTrack = 12;
+    DesignateEngrave = 13;
+    DesignateCarveFortification = 14;
+    Stockpiles = 15;
+    Build = 16;
+    QueryBuilding = 17;
+    Orders = 18;
+    OrdersForbid = 19;
+    OrdersRefuse = 20;
+    OrdersWorkshop = 21;
+    OrdersZone = 22;
+    BuildingItems = 23;
+    ViewUnits = 24;
+    LookAround = 25;
+    DesignateItemsClaim = 26;
+    DesignateItemsForbid = 27;
+    DesignateItemsMelt = 28;
+    DesignateItemsUnmelt = 29;
+    DesignateItemsDump = 30;
+    DesignateItemsUndump = 31;
+    DesignateItemsHide = 32;
+    DesignateItemsUnhide = 33;
+    DesignateChopTrees = 34;
+    DesignateToggleEngravings = 35;
+    DesignateToggleMarker = 36;
+    Hotkeys = 37;
+    DesignateTrafficHigh = 38;
+    DesignateTrafficNormal = 39;
+    DesignateTrafficLow = 40;
+    DesignateTrafficRestricted = 41;
+    Zones = 42;
+    ZonesPenInfo = 43;
+    ZonesPitInfo = 44;
+    ZonesHospitalInfo = 45;
+    ZonesGatherInfo = 46;
+    DesignateRemoveConstruction = 47;
+    DepotAccess = 48;
+    NotesPoints = 49;
+    NotesRoutes = 50;
+    Burrows = 51;
+    Hauling = 52;
+    ArenaWeather = 53;
+    ArenaTrees = 54;
 }

plugins/remotefortressreader/dwarf_control.cpp

@@ -104,5 +104,7 @@ command_result SetPauseState(color_ostream &stream, const SingleBool *in)
 
 command_result GetSideMenu(DFHack::color_ostream &stream, const dfproto::EmptyMessage *in, DwarfControl::SidebarState *out)
 {
-    out->set_mode((proto::enums::ui_sidebar_mode::ui_sidebar_mode)df::global::ui->main.mode);
+    auto ui = df::global::ui;
+    out->set_mode((proto::enums::ui_sidebar_mode::ui_sidebar_mode)ui->main.mode);
+    return CR_OK;
 }