diff options
| author | Alexander Gavrilov | 2012-09-18 13:11:11 +0400 |
|---|---|---|
| committer | Alexander Gavrilov | 2012-09-18 13:11:11 +0400 |
| commit | d70a79deb99a3c4ae6458317ee1111928f3db401 (patch) | |
| tree | 37c9325ca0b0b98fb56c850b55ad5cc036cab2f2 /library/modules | |
| parent | be928a9dc537290522577cde41211637f3b6f165 (diff) | |
| download | dfhack-d70a79deb99a3c4ae6458317ee1111928f3db401.tar.gz dfhack-d70a79deb99a3c4ae6458317ee1111928f3db401.tar.bz2 dfhack-d70a79deb99a3c4ae6458317ee1111928f3db401.tar.xz | |
Follow changes in XML defs.
Diffstat (limited to 'library/modules')
| -rw-r--r-- | library/modules/Gui.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/library/modules/Gui.cpp b/library/modules/Gui.cpp index b0cfda67..1662f446 100644 --- a/library/modules/Gui.cpp +++ b/library/modules/Gui.cpp @@ -332,9 +332,9 @@ DEFINE_GET_FOCUS_STRING_HANDLER(layer_military) focus += "/" + enum_item_key(screen->page); int cur_list; - if (list1->bright) cur_list = 0; - else if (list2->bright) cur_list = 1; - else if (list3->bright) cur_list = 2; + if (list1->active) cur_list = 0; + else if (list2->active) cur_list = 1; + else if (list3->active) cur_list = 2; else return; switch (screen->page) @@ -420,7 +420,7 @@ DEFINE_GET_FOCUS_STRING_HANDLER(layer_assigntrade) if (unsigned(list_idx) >= num_lists) return; - if (list1->bright) + if (list1->active) focus += "/Groups"; else focus += "/Items"; @@ -458,10 +458,10 @@ DEFINE_GET_FOCUS_STRING_HANDLER(layer_stockpile) focus += "/On"; - if (list2->bright || list3->bright || screen->list_ids.empty()) { + if (list2->active || list3->active || screen->list_ids.empty()) { focus += "/" + enum_item_key(screen->cur_list); - if (list3->bright) + if (list3->active) focus += (screen->item_names.empty() ? "/None" : "/Item"); } } @@ -844,7 +844,7 @@ static df::item *getAnyItem(df::viewscreen *top) { auto list1 = getLayerList(screen, 0); auto list2 = getLayerList(screen, 1); - if (!list1 || !list2 || !list2->bright) + if (!list1 || !list2 || !list2->active) return NULL; int list_idx = vector_get(screen->visible_lists, list1->cursor, (int16_t)-1); |
