Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[simgui] Add 'Invalid' option for AllianceStation #5820

Merged
merged 2 commits into from
Oct 24, 2023
Merged

[simgui] Add 'Invalid' option for AllianceStation #5820

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a71875a
[simgui] Add 'Invalid' option for AllianceStation
Oct 24, 2023
0e4170f
Formatting fixes
github-actions[bot] Oct 24, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions glass/src/lib/native/cpp/other/FMS.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@

using namespace glass;

static const char* stations[] = {"Red 1", "Red 2", "Red 3",
"Blue 1", "Blue 2", "Blue 3"};
static const char* stations[] = {"Invalid", "Red 1", "Red 2", "Red 3",
"Blue 1", "Blue 2", "Blue 3"};

void glass::DisplayFMS(FMSModel* model) {
if (!model->Exists() || model->IsReadOnly()) {
Expand Down Expand Up @@ -41,7 +41,7 @@ void glass::DisplayFMS(FMSModel* model) {
if (auto data = model->GetAllianceStationIdData()) {
int val = data->GetValue();
ImGui::SetNextItemWidth(ImGui::GetFontSize() * 8);
if (ImGui::Combo("Alliance Station", &val, stations, 6)) {
if (ImGui::Combo("Alliance Station", &val, stations, 7)) {
model->SetAllianceStationId(val);
}
data->EmitDrag();
Expand Down