fixed sidebar mode numbering.

develop
JapaMala 2018-06-24 16:19:52 +05:30
parent 93c3418f97
commit 4970935b9a
2 changed files with 58 additions and 56 deletions

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

@ -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) 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;
} }