From 51657e10769faa2617d546a06c42e4c62a19bb50 Mon Sep 17 00:00:00 2001 From: Aki Date: Sun, 30 Jan 2022 17:41:24 +0100 Subject: Removed trailing whitespace all over the place --- Stars45/NavDlg.cpp | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) (limited to 'Stars45/NavDlg.cpp') diff --git a/Stars45/NavDlg.cpp b/Stars45/NavDlg.cpp index bbe50c2..50cd020 100644 --- a/Stars45/NavDlg.cpp +++ b/Stars45/NavDlg.cpp @@ -74,7 +74,7 @@ DEF_MAP_CLIENT(NavDlg, OnClose); // +--------------------------------------------------------------------+ static char* filter_name[] = { - "SYSTEM", "PLANET", + "SYSTEM", "PLANET", "SECTOR", "STATION", "STARSHIP", "FIGHTER" }; @@ -104,8 +104,8 @@ const int VIEW_REGION = 2; NavDlg::NavDlg(Screen* s, FormDef& def, BaseScreen* mgr) : FormWindow(s, 0, 0, s->Width(), s->Height()), manager(mgr), -loc_labels(0), dst_labels(0), loc_data(0), dst_data(0), -seln_list(0), info_list(0), seln_mode(SELECT_REGION), +loc_labels(0), dst_labels(0), loc_data(0), dst_data(0), +seln_list(0), info_list(0), seln_mode(SELECT_REGION), nav_edit_mode(NAV_EDIT_NONE), star_map(0), map_win(0), star_system(0), ship(0), mission(0), editor(false) { @@ -231,7 +231,7 @@ NavDlg::SetSystem(StarSystem* s) ListIter planet = star->Satellites(); while (++planet) { planets.append(planet.value()); - + ListIter moon = planet->Satellites(); while (++moon) { planets.append(moon.value()); @@ -378,11 +378,11 @@ NavDlg::ExecFrame() char y[16]; char z[16]; char d[16]; - + FormatNumber(x, -ship->Location().x); FormatNumber(y, ship->Location().z); FormatNumber(z, ship->Location().y); - + strcpy_s(loc_buf, Game::GetText("NavDlg.loc-labels").data()); loc_labels->SetText(loc_buf); @@ -399,7 +399,7 @@ NavDlg::ExecFrame() } loc_data->SetText(loc_buf); - + if (ship) { NavSystem* navsys = ship->GetNavSystem(); @@ -424,7 +424,7 @@ NavDlg::ExecFrame() if (dst_labels) { Instruction* navpt = ship->GetNextNavPoint(); - + if (navpt && navpt->Region()) { FormatNumber(x, navpt->Location().x); FormatNumber(y, navpt->Location().y); @@ -436,11 +436,11 @@ NavDlg::ExecFrame() npt -= sim->GetActiveRegion()->Location(); npt = npt.OtherHand(); - + // distance from self to navpt: distance = Point(npt - ship->Location()).length(); FormatNumber(d, distance); - + strcpy_s(loc_buf, Game::GetText("NavDlg.dst-labels").data()); dst_labels->SetText(loc_buf); @@ -464,7 +464,7 @@ NavDlg::ExecFrame() (zoom_in_btn && zoom_in_btn->GetButtonState() > 0)) { star_map->ZoomIn(); } - else if (Keyboard::KeyDown(VK_SUBTRACT) || + else if (Keyboard::KeyDown(VK_SUBTRACT) || (zoom_out_btn && zoom_out_btn->GetButtonState() > 0)) { star_map->ZoomOut(); } @@ -774,7 +774,7 @@ NavDlg::UpdateSelection() } } - else if (seln_mode == SELECT_STATION || + else if (seln_mode == SELECT_STATION || seln_mode == SELECT_STARSHIP || seln_mode == SELECT_FIGHTER) { @@ -866,7 +866,7 @@ NavDlg::UpdateLists() seln_list->ClearItems(); switch (seln_mode) { - case SELECT_SYSTEM: + case SELECT_SYSTEM: { seln_list->SetColumnTitle(0, Game::GetText(Text("NavDlg.filter.") + filter_name[seln_mode])); int i = 0; @@ -947,7 +947,7 @@ NavDlg::UpdateLists() if (filter_ok) { bool visible = s->GetIFF() == 0 || s->GetIFF() == ship->GetIFF() || - s->GetElement() && + s->GetElement() && s->GetElement()->IntelLevel() > Intel::KNOWN; if (visible) -- cgit v1.1