From 69209c38968c6f4066a772e0a51a2928749217de Mon Sep 17 00:00:00 2001 From: "FWoltermann@gmail.com" Date: Fri, 9 Dec 2011 19:00:23 +0000 Subject: Re-indenting the code to use standard tabs. Yes, I know this is pretty pointless, but who cares? --- Stars45/NavDlg.cpp | 1692 ++++++++++++++++++++++++++-------------------------- 1 file changed, 846 insertions(+), 846 deletions(-) (limited to 'Stars45/NavDlg.cpp') diff --git a/Stars45/NavDlg.cpp b/Stars45/NavDlg.cpp index 5c702c4..7002e2a 100644 --- a/Stars45/NavDlg.cpp +++ b/Stars45/NavDlg.cpp @@ -1,14 +1,14 @@ /* Project Starshatter 5.0 - Destroyer Studios LLC - Copyright © 1997-2007. All Rights Reserved. + Destroyer Studios LLC + Copyright © 1997-2007. All Rights Reserved. - SUBSYSTEM: Stars.exe - FILE: NavDlg.cpp - AUTHOR: John DiCamillo + SUBSYSTEM: Stars.exe + FILE: NavDlg.cpp + AUTHOR: John DiCamillo - OVERVIEW - ======== + OVERVIEW + ======== */ #include "MemDebug.h" @@ -50,9 +50,9 @@ DEF_MAP_CLIENT(NavDlg, OnClose); // +--------------------------------------------------------------------+ static char* filter_name[] = { - "SYSTEM", "PLANET", - "SECTOR", "STATION", - "STARSHIP", "FIGHTER" + "SYSTEM", "PLANET", + "SECTOR", "STATION", + "STARSHIP", "FIGHTER" }; static char* commit_name = "Commit"; @@ -79,13 +79,13 @@ 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), - nav_edit_mode(NAV_EDIT_NONE), star_map(0), map_win(0), - star_system(0), ship(0), mission(0), editor(false) +: 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), +nav_edit_mode(NAV_EDIT_NONE), star_map(0), map_win(0), +star_system(0), ship(0), mission(0), editor(false) { - Init(def); + Init(def); } NavDlg::~NavDlg() @@ -94,64 +94,64 @@ NavDlg::~NavDlg() void NavDlg::RegisterControls() { - int i; + int i; - map_win = FindControl(100); + map_win = FindControl(100); - if (map_win) { - star_map = new(__FILE__,__LINE__) MapView(map_win); + if (map_win) { + star_map = new(__FILE__,__LINE__) MapView(map_win); - REGISTER_CLIENT(EID_LBUTTON_DOWN, map_win, NavDlg, OnMapDown); - REGISTER_CLIENT(EID_MOUSE_MOVE, map_win, NavDlg, OnMapMove); - REGISTER_CLIENT(EID_MAP_CLICK, map_win, NavDlg, OnMapClick); - } + REGISTER_CLIENT(EID_LBUTTON_DOWN, map_win, NavDlg, OnMapDown); + REGISTER_CLIENT(EID_MOUSE_MOVE, map_win, NavDlg, OnMapMove); + REGISTER_CLIENT(EID_MAP_CLICK, map_win, NavDlg, OnMapClick); + } - for (i = 0; i < 3; i++) { - view_btn[i] = (Button*) FindControl(101 + i); - REGISTER_CLIENT(EID_CLICK, view_btn[i], NavDlg, OnView); - } + for (i = 0; i < 3; i++) { + view_btn[i] = (Button*) FindControl(101 + i); + REGISTER_CLIENT(EID_CLICK, view_btn[i], NavDlg, OnView); + } - close_btn = (Button*) FindControl(2); + close_btn = (Button*) FindControl(2); - if (close_btn) - REGISTER_CLIENT(EID_CLICK, close_btn, NavDlg, OnClose); + if (close_btn) + REGISTER_CLIENT(EID_CLICK, close_btn, NavDlg, OnClose); - zoom_in_btn = (Button*) FindControl(110); - zoom_out_btn = (Button*) FindControl(111); + zoom_in_btn = (Button*) FindControl(110); + zoom_out_btn = (Button*) FindControl(111); - for (i = 0; i < 6; i++) { - filter_btn[i] = (Button*) FindControl(401 + i); - REGISTER_CLIENT(EID_CLICK, filter_btn[i], NavDlg, OnFilter); - } + for (i = 0; i < 6; i++) { + filter_btn[i] = (Button*) FindControl(401 + i); + REGISTER_CLIENT(EID_CLICK, filter_btn[i], NavDlg, OnFilter); + } - commit_btn = (Button*) FindControl(1); + commit_btn = (Button*) FindControl(1); - if (commit_btn) { - REGISTER_CLIENT(EID_CLICK, commit_btn, NavDlg, OnEngage); - } + if (commit_btn) { + REGISTER_CLIENT(EID_CLICK, commit_btn, NavDlg, OnEngage); + } - loc_labels = FindControl(601); - dst_labels = FindControl(602); - loc_data = FindControl(701); - dst_data = FindControl(702); + loc_labels = FindControl(601); + dst_labels = FindControl(602); + loc_data = FindControl(701); + dst_data = FindControl(702); - seln_list = (ListBox*) FindControl(801); + seln_list = (ListBox*) FindControl(801); - if (seln_list) { - seln_list->SetSelectedStyle(ListBox::LIST_ITEM_STYLE_FILLED_BOX); - REGISTER_CLIENT(EID_SELECT, seln_list, NavDlg, OnSelect); - } + if (seln_list) { + seln_list->SetSelectedStyle(ListBox::LIST_ITEM_STYLE_FILLED_BOX); + REGISTER_CLIENT(EID_SELECT, seln_list, NavDlg, OnSelect); + } - info_list = (ListBox*) FindControl(802); + info_list = (ListBox*) FindControl(802); - if (star_map) { - star_map->SetViewMode(VIEW_SYSTEM); - view_btn[1]->SetButtonState(1); + if (star_map) { + star_map->SetViewMode(VIEW_SYSTEM); + view_btn[1]->SetButtonState(1); - star_map->SetSelectionMode(2); - } + star_map->SetSelectionMode(2); + } - UpdateSelection(); + UpdateSelection(); } // +--------------------------------------------------------------------+ @@ -159,69 +159,69 @@ NavDlg::RegisterControls() void NavDlg::SetSystem(StarSystem* s) { - if (star_system == s) - return; - - star_system = s; - - if (star_map) { - Campaign* c = Campaign::GetCampaign(); - Sim* sim = Sim::GetSim(); - - if (sim && sim->GetSystemList().size()) { - star_map->SetGalaxy(sim->GetSystemList()); - } - else if (mission && mission->GetSystemList().size()) { - star_map->SetGalaxy(mission->GetSystemList()); - } - else if (c && c->GetSystemList().size()) { - star_map->SetGalaxy(c->GetSystemList()); - } - else { - Galaxy* g = Galaxy::GetInstance(); - if (g) - star_map->SetGalaxy(g->GetSystemList()); - } - - star_map->SetSystem(s); - } - - // flush old object pointers: - stars.clear(); - planets.clear(); - regions.clear(); - contacts.clear(); - - if (star_system) { - // insert objects from star system: - ListIter star = star_system->Bodies(); - while (++star) { - switch (star->Type()) { - case Orbital::STAR: stars.append(star.value()); - break; - case Orbital::PLANET: - case Orbital::MOON: planets.append(star.value()); - break; - } - - ListIter planet = star->Satellites(); - while (++planet) { - planets.append(planet.value()); - - ListIter moon = planet->Satellites(); - while (++moon) { - planets.append(moon.value()); - } - } - } - - ListIter rgn = star_system->AllRegions(); - while (++rgn) - regions.append(rgn.value()); - } - - // sort region list by distance from the star: - regions.sort(); + if (star_system == s) + return; + + star_system = s; + + if (star_map) { + Campaign* c = Campaign::GetCampaign(); + Sim* sim = Sim::GetSim(); + + if (sim && sim->GetSystemList().size()) { + star_map->SetGalaxy(sim->GetSystemList()); + } + else if (mission && mission->GetSystemList().size()) { + star_map->SetGalaxy(mission->GetSystemList()); + } + else if (c && c->GetSystemList().size()) { + star_map->SetGalaxy(c->GetSystemList()); + } + else { + Galaxy* g = Galaxy::GetInstance(); + if (g) + star_map->SetGalaxy(g->GetSystemList()); + } + + star_map->SetSystem(s); + } + + // flush old object pointers: + stars.clear(); + planets.clear(); + regions.clear(); + contacts.clear(); + + if (star_system) { + // insert objects from star system: + ListIter star = star_system->Bodies(); + while (++star) { + switch (star->Type()) { + case Orbital::STAR: stars.append(star.value()); + break; + case Orbital::PLANET: + case Orbital::MOON: planets.append(star.value()); + break; + } + + ListIter planet = star->Satellites(); + while (++planet) { + planets.append(planet.value()); + + ListIter moon = planet->Satellites(); + while (++moon) { + planets.append(moon.value()); + } + } + } + + ListIter rgn = star_system->AllRegions(); + while (++rgn) + regions.append(rgn.value()); + } + + // sort region list by distance from the star: + regions.sort(); } // +--------------------------------------------------------------------+ @@ -229,35 +229,35 @@ NavDlg::SetSystem(StarSystem* s) void NavDlg::SetShip(Ship* s) { - if (ship == s) - return; + if (ship == s) + return; - ship = s; + ship = s; - if (ship) - SetSystem(ship->GetRegion()->System()); + if (ship) + SetSystem(ship->GetRegion()->System()); - if (star_map) { - Sim* sim = Sim::GetSim(); + if (star_map) { + Sim* sim = Sim::GetSim(); - if (sim && sim->GetSystemList().size()) - star_map->SetGalaxy(sim->GetSystemList()); + if (sim && sim->GetSystemList().size()) + star_map->SetGalaxy(sim->GetSystemList()); - star_map->SetShip(ship); + star_map->SetShip(ship); - if (ship) { - star_map->SetRegion(ship->GetRegion()->GetOrbitalRegion()); - UseViewMode(VIEW_REGION); - star_map->SetSelectedShip(ship); - } - } + if (ship) { + star_map->SetRegion(ship->GetRegion()->GetOrbitalRegion()); + UseViewMode(VIEW_REGION); + star_map->SetSelectedShip(ship); + } + } - for (int i = 0; i < 6; i++) - filter_btn[i]->SetButtonState(0); + for (int i = 0; i < 6; i++) + filter_btn[i]->SetButtonState(0); - filter_btn[SELECT_REGION]->SetButtonState(1); - UseFilter(SELECT_STARSHIP); - UpdateSelection(); + filter_btn[SELECT_REGION]->SetButtonState(1); + UseFilter(SELECT_STARSHIP); + UpdateSelection(); } // +--------------------------------------------------------------------+ @@ -265,69 +265,69 @@ NavDlg::SetShip(Ship* s) void NavDlg::SetMission(Mission* m) { - if (!m && mission == m) - return; - - if (mission == m && star_system == m->GetStarSystem()) - return; - - mission = m; - - if (mission) { - SetSystem(mission->GetStarSystem()); - } - - if (star_map) { - Campaign* c = Campaign::GetCampaign(); - Sim* sim = Sim::GetSim(); - - star_map->SetMission(0); // prevent building map menu twice - - if (sim && sim->GetSystemList().size()) { - star_map->SetGalaxy(sim->GetSystemList()); - } - else if (mission && mission->GetSystemList().size()) { - star_map->SetGalaxy(mission->GetSystemList()); - } - else if (c && c->GetSystemList().size()) { - star_map->SetGalaxy(c->GetSystemList()); - } - else { - Galaxy* g = Galaxy::GetInstance(); - if (g) - star_map->SetGalaxy(g->GetSystemList()); - } - - if (mission) { - star_map->SetMission(mission); - star_map->SetRegionByName(mission->GetRegion()); - - if (star_map->GetViewMode() == VIEW_REGION) { - ListIter elem = mission->GetElements(); - while (++elem) { - MissionElement* e = elem.value(); - - if (e->Player()) - star_map->SetSelectedElem(e); - } - } - } - } - - bool updated = false; - - if (mission) { - Orbital* rgn = 0; - rgn = mission->GetStarSystem()->FindOrbital(mission->GetRegion()); - - if (rgn) { - SelectRegion((OrbitalRegion*) rgn); - updated = true; - } - } - - if (!updated) - UpdateSelection(); + if (!m && mission == m) + return; + + if (mission == m && star_system == m->GetStarSystem()) + return; + + mission = m; + + if (mission) { + SetSystem(mission->GetStarSystem()); + } + + if (star_map) { + Campaign* c = Campaign::GetCampaign(); + Sim* sim = Sim::GetSim(); + + star_map->SetMission(0); // prevent building map menu twice + + if (sim && sim->GetSystemList().size()) { + star_map->SetGalaxy(sim->GetSystemList()); + } + else if (mission && mission->GetSystemList().size()) { + star_map->SetGalaxy(mission->GetSystemList()); + } + else if (c && c->GetSystemList().size()) { + star_map->SetGalaxy(c->GetSystemList()); + } + else { + Galaxy* g = Galaxy::GetInstance(); + if (g) + star_map->SetGalaxy(g->GetSystemList()); + } + + if (mission) { + star_map->SetMission(mission); + star_map->SetRegionByName(mission->GetRegion()); + + if (star_map->GetViewMode() == VIEW_REGION) { + ListIter elem = mission->GetElements(); + while (++elem) { + MissionElement* e = elem.value(); + + if (e->Player()) + star_map->SetSelectedElem(e); + } + } + } + } + + bool updated = false; + + if (mission) { + Orbital* rgn = 0; + rgn = mission->GetStarSystem()->FindOrbital(mission->GetRegion()); + + if (rgn) { + SelectRegion((OrbitalRegion*) rgn); + updated = true; + } + } + + if (!updated) + UpdateSelection(); } // +--------------------------------------------------------------------+ @@ -335,10 +335,10 @@ NavDlg::SetMission(Mission* m) void NavDlg::SetEditorMode(bool e) { - editor = e; + editor = e; - if (star_map) - star_map->SetEditorMode(editor); + if (star_map) + star_map->SetEditorMode(editor); } // +--------------------------------------------------------------------+ @@ -346,124 +346,124 @@ NavDlg::SetEditorMode(bool e) void NavDlg::ExecFrame() { - Sim* sim = Sim::GetSim(); - - if (loc_labels && ship) { - char loc_buf[512]; - char x[16]; - 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(loc_buf, Game::GetText("NavDlg.loc-labels").data()); - loc_labels->SetText(loc_buf); - - if (sim->GetActiveRegion()) { - sprintf(loc_buf, "\n%s\n%s\n%s, %s, %s", - (const char*) star_system->Name(), - (const char*) sim->GetActiveRegion()->Name(), - x, y, z); - - } - else { - sprintf(loc_buf, "\n%s\nPlanck Space?\n%s, %s, %s", - (const char*) star_system->Name(), x, y, z); - } - - loc_data->SetText(loc_buf); - - if (ship) { - NavSystem* navsys = ship->GetNavSystem(); - - if (ship->GetNextNavPoint() == 0 || !navsys) { - commit_btn->SetText(Game::GetText("NavDlg.commit")); - commit_btn->SetBackColor(commit_color); - commit_btn->SetEnabled(false); - } - else if (navsys) { - commit_btn->SetEnabled(true); - - if (navsys->AutoNavEngaged()) { - commit_btn->SetText(Game::GetText("NavDlg.cancel")); - commit_btn->SetBackColor(cancel_color); - } - else { - commit_btn->SetText(Game::GetText("NavDlg.commit")); - commit_btn->SetBackColor(commit_color); - } - } - } - - if (dst_labels) { - Instruction* navpt = ship->GetNextNavPoint(); - - if (navpt && navpt->Region()) { - FormatNumber(x, navpt->Location().x); - FormatNumber(y, navpt->Location().y); - FormatNumber(z, navpt->Location().z); - - double distance = 0; - Point npt = navpt->Region()->Location() + navpt->Location(); - if (sim->GetActiveRegion()) - npt -= sim->GetActiveRegion()->Location(); - - npt = npt.OtherHand(); - - // distance from self to navpt: - distance = Point(npt - ship->Location()).length(); - FormatNumber(d, distance); - - strcpy(loc_buf, Game::GetText("NavDlg.dst-labels").data()); - dst_labels->SetText(loc_buf); - - sprintf(loc_buf, "\n%s\n%s\n%s, %s, %s\n%s", - (const char*) star_system->Name(), - (const char*) navpt->Region()->Name(), - x, y, z, d); - dst_data->SetText(loc_buf); - } - else { - dst_labels->SetText(Game::GetText("NavDlg.destination")); - dst_data->SetText(Game::GetText("NavDlg.not-avail")); - } - } - } - - UpdateSelection(); - UpdateLists(); - - if (Keyboard::KeyDown(VK_ADD) || - (zoom_in_btn && zoom_in_btn->GetButtonState() > 0)) { - star_map->ZoomIn(); - } - else if (Keyboard::KeyDown(VK_SUBTRACT) || - (zoom_out_btn && zoom_out_btn->GetButtonState() > 0)) { - star_map->ZoomOut(); - } - - else if (star_map->TargetRect().Contains(Mouse::X(),Mouse::Y())) { - - if (Mouse::Wheel() > 0) { - star_map->ZoomIn(); - star_map->ZoomIn(); - star_map->ZoomIn(); - } - - else if (Mouse::Wheel() < 0) { - star_map->ZoomOut(); - star_map->ZoomOut(); - star_map->ZoomOut(); - } - } - - if (nav_edit_mode == NAV_EDIT_NONE) - Mouse::SetCursor(Mouse::ARROW); - else - Mouse::SetCursor(Mouse::CROSS); + Sim* sim = Sim::GetSim(); + + if (loc_labels && ship) { + char loc_buf[512]; + char x[16]; + 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(loc_buf, Game::GetText("NavDlg.loc-labels").data()); + loc_labels->SetText(loc_buf); + + if (sim->GetActiveRegion()) { + sprintf(loc_buf, "\n%s\n%s\n%s, %s, %s", + (const char*) star_system->Name(), + (const char*) sim->GetActiveRegion()->Name(), + x, y, z); + + } + else { + sprintf(loc_buf, "\n%s\nPlanck Space?\n%s, %s, %s", + (const char*) star_system->Name(), x, y, z); + } + + loc_data->SetText(loc_buf); + + if (ship) { + NavSystem* navsys = ship->GetNavSystem(); + + if (ship->GetNextNavPoint() == 0 || !navsys) { + commit_btn->SetText(Game::GetText("NavDlg.commit")); + commit_btn->SetBackColor(commit_color); + commit_btn->SetEnabled(false); + } + else if (navsys) { + commit_btn->SetEnabled(true); + + if (navsys->AutoNavEngaged()) { + commit_btn->SetText(Game::GetText("NavDlg.cancel")); + commit_btn->SetBackColor(cancel_color); + } + else { + commit_btn->SetText(Game::GetText("NavDlg.commit")); + commit_btn->SetBackColor(commit_color); + } + } + } + + if (dst_labels) { + Instruction* navpt = ship->GetNextNavPoint(); + + if (navpt && navpt->Region()) { + FormatNumber(x, navpt->Location().x); + FormatNumber(y, navpt->Location().y); + FormatNumber(z, navpt->Location().z); + + double distance = 0; + Point npt = navpt->Region()->Location() + navpt->Location(); + if (sim->GetActiveRegion()) + npt -= sim->GetActiveRegion()->Location(); + + npt = npt.OtherHand(); + + // distance from self to navpt: + distance = Point(npt - ship->Location()).length(); + FormatNumber(d, distance); + + strcpy(loc_buf, Game::GetText("NavDlg.dst-labels").data()); + dst_labels->SetText(loc_buf); + + sprintf(loc_buf, "\n%s\n%s\n%s, %s, %s\n%s", + (const char*) star_system->Name(), + (const char*) navpt->Region()->Name(), + x, y, z, d); + dst_data->SetText(loc_buf); + } + else { + dst_labels->SetText(Game::GetText("NavDlg.destination")); + dst_data->SetText(Game::GetText("NavDlg.not-avail")); + } + } + } + + UpdateSelection(); + UpdateLists(); + + if (Keyboard::KeyDown(VK_ADD) || + (zoom_in_btn && zoom_in_btn->GetButtonState() > 0)) { + star_map->ZoomIn(); + } + else if (Keyboard::KeyDown(VK_SUBTRACT) || + (zoom_out_btn && zoom_out_btn->GetButtonState() > 0)) { + star_map->ZoomOut(); + } + + else if (star_map->TargetRect().Contains(Mouse::X(),Mouse::Y())) { + + if (Mouse::Wheel() > 0) { + star_map->ZoomIn(); + star_map->ZoomIn(); + star_map->ZoomIn(); + } + + else if (Mouse::Wheel() < 0) { + star_map->ZoomOut(); + star_map->ZoomOut(); + star_map->ZoomOut(); + } + } + + if (nav_edit_mode == NAV_EDIT_NONE) + Mouse::SetCursor(Mouse::ARROW); + else + Mouse::SetCursor(Mouse::CROSS); } // +--------------------------------------------------------------------+ @@ -471,40 +471,40 @@ NavDlg::ExecFrame() void NavDlg::OnView(AWEvent* event) { - int use_filter_mode = -1; - - view_btn[VIEW_GALAXY]->SetButtonState(0); - view_btn[VIEW_SYSTEM]->SetButtonState(0); - view_btn[VIEW_REGION]->SetButtonState(0); - - if (view_btn[0] == event->window) { - star_map->SetViewMode(VIEW_GALAXY); - view_btn[VIEW_GALAXY]->SetButtonState(1); - use_filter_mode = SELECT_SYSTEM; - } - - else if (view_btn[VIEW_SYSTEM] == event->window) { - star_map->SetViewMode(VIEW_SYSTEM); - view_btn[VIEW_SYSTEM]->SetButtonState(1); - use_filter_mode = SELECT_REGION; - } - - else if (view_btn[VIEW_REGION] == event->window) { - star_map->SetViewMode(VIEW_REGION); - view_btn[VIEW_REGION]->SetButtonState(1); - use_filter_mode = SELECT_STARSHIP; - } - - if (use_filter_mode >= 0) { - for (int i = 0; i < 6; i++) { - if (i == use_filter_mode) - filter_btn[i]->SetButtonState(1); - else - filter_btn[i]->SetButtonState(0); - } - - UseFilter(use_filter_mode); - } + int use_filter_mode = -1; + + view_btn[VIEW_GALAXY]->SetButtonState(0); + view_btn[VIEW_SYSTEM]->SetButtonState(0); + view_btn[VIEW_REGION]->SetButtonState(0); + + if (view_btn[0] == event->window) { + star_map->SetViewMode(VIEW_GALAXY); + view_btn[VIEW_GALAXY]->SetButtonState(1); + use_filter_mode = SELECT_SYSTEM; + } + + else if (view_btn[VIEW_SYSTEM] == event->window) { + star_map->SetViewMode(VIEW_SYSTEM); + view_btn[VIEW_SYSTEM]->SetButtonState(1); + use_filter_mode = SELECT_REGION; + } + + else if (view_btn[VIEW_REGION] == event->window) { + star_map->SetViewMode(VIEW_REGION); + view_btn[VIEW_REGION]->SetButtonState(1); + use_filter_mode = SELECT_STARSHIP; + } + + if (use_filter_mode >= 0) { + for (int i = 0; i < 6; i++) { + if (i == use_filter_mode) + filter_btn[i]->SetButtonState(1); + else + filter_btn[i]->SetButtonState(0); + } + + UseFilter(use_filter_mode); + } } // +--------------------------------------------------------------------+ @@ -512,29 +512,29 @@ NavDlg::OnView(AWEvent* event) void NavDlg::OnFilter(AWEvent* event) { - int filter_index = -1; - for (int i = 0; i < 6; i++) { - if (filter_btn[i] == event->window) { - filter_index = i; - filter_btn[i]->SetButtonState(1); - } - else { - filter_btn[i]->SetButtonState(0); - } - } - - if (filter_index >= 0) - UseFilter(filter_index); + int filter_index = -1; + for (int i = 0; i < 6; i++) { + if (filter_btn[i] == event->window) { + filter_index = i; + filter_btn[i]->SetButtonState(1); + } + else { + filter_btn[i]->SetButtonState(0); + } + } + + if (filter_index >= 0) + UseFilter(filter_index); } void NavDlg::UseFilter(int filter_index) { - seln_mode = filter_index; + seln_mode = filter_index; - star_map->SetSelectionMode(seln_mode); - UpdateSelection(); - UpdateLists(); + star_map->SetSelectionMode(seln_mode); + UpdateSelection(); + UpdateLists(); } // +--------------------------------------------------------------------+ @@ -542,108 +542,108 @@ NavDlg::UseFilter(int filter_index) void NavDlg::UseViewMode(int mode) { - if (mode >= 0 && mode < 3) { - int use_filter_mode = -1; - - view_btn[VIEW_GALAXY]->SetButtonState(0); - view_btn[VIEW_SYSTEM]->SetButtonState(0); - view_btn[VIEW_REGION]->SetButtonState(0); - - if (mode == 0) { - star_map->SetViewMode(VIEW_GALAXY); - view_btn[VIEW_GALAXY]->SetButtonState(1); - use_filter_mode = SELECT_SYSTEM; - } - - else if (mode == 1) { - star_map->SetViewMode(VIEW_SYSTEM); - view_btn[VIEW_SYSTEM]->SetButtonState(1); - use_filter_mode = SELECT_REGION; - } - - else if (mode == 2) { - star_map->SetViewMode(VIEW_REGION); - view_btn[VIEW_REGION]->SetButtonState(1); - use_filter_mode = SELECT_STARSHIP; - } - - if (use_filter_mode >= 0) { - for (int i = 0; i < 6; i++) { - filter_btn[i]->SetButtonState(i == use_filter_mode); - } - - UseFilter(use_filter_mode); - } - } + if (mode >= 0 && mode < 3) { + int use_filter_mode = -1; + + view_btn[VIEW_GALAXY]->SetButtonState(0); + view_btn[VIEW_SYSTEM]->SetButtonState(0); + view_btn[VIEW_REGION]->SetButtonState(0); + + if (mode == 0) { + star_map->SetViewMode(VIEW_GALAXY); + view_btn[VIEW_GALAXY]->SetButtonState(1); + use_filter_mode = SELECT_SYSTEM; + } + + else if (mode == 1) { + star_map->SetViewMode(VIEW_SYSTEM); + view_btn[VIEW_SYSTEM]->SetButtonState(1); + use_filter_mode = SELECT_REGION; + } + + else if (mode == 2) { + star_map->SetViewMode(VIEW_REGION); + view_btn[VIEW_REGION]->SetButtonState(1); + use_filter_mode = SELECT_STARSHIP; + } + + if (use_filter_mode >= 0) { + for (int i = 0; i < 6; i++) { + filter_btn[i]->SetButtonState(i == use_filter_mode); + } + + UseFilter(use_filter_mode); + } + } } void NavDlg::SelectStar(Orbital* star) { - UseViewMode(0); - - if (stars.size()) { - int sel = 0; - - ListIter iter = stars; - while (++iter) { - if (iter.value() == star) { - int old_seln_mode = seln_mode; - UseFilter(SELECT_SYSTEM); - SelectObject(sel); - UseFilter(old_seln_mode); - return; - } - - sel++; - } - } + UseViewMode(0); + + if (stars.size()) { + int sel = 0; + + ListIter iter = stars; + while (++iter) { + if (iter.value() == star) { + int old_seln_mode = seln_mode; + UseFilter(SELECT_SYSTEM); + SelectObject(sel); + UseFilter(old_seln_mode); + return; + } + + sel++; + } + } } void NavDlg::SelectPlanet(Orbital* planet) { - UseViewMode(1); - - if (planets.size()) { - int sel = 0; - - ListIter iter = planets; - while (++iter) { - if (iter.value() == planet) { - int old_seln_mode = seln_mode; - UseFilter(SELECT_PLANET); - SelectObject(sel); - UseFilter(old_seln_mode); - return; - } - - sel++; - } - } + UseViewMode(1); + + if (planets.size()) { + int sel = 0; + + ListIter iter = planets; + while (++iter) { + if (iter.value() == planet) { + int old_seln_mode = seln_mode; + UseFilter(SELECT_PLANET); + SelectObject(sel); + UseFilter(old_seln_mode); + return; + } + + sel++; + } + } } void NavDlg::SelectRegion(OrbitalRegion* rgn) { - UseViewMode(2); - - if (regions.size()) { - int sel = 0; - - ListIter iter = regions; - while (++iter) { - if (iter.value() == rgn) { - int old_seln_mode = seln_mode; - UseFilter(SELECT_REGION); - SelectObject(sel); - UseFilter(old_seln_mode); - return; - } - - sel++; - } - } + UseViewMode(2); + + if (regions.size()) { + int sel = 0; + + ListIter iter = regions; + while (++iter) { + if (iter.value() == rgn) { + int old_seln_mode = seln_mode; + UseFilter(SELECT_REGION); + SelectObject(sel); + UseFilter(old_seln_mode); + return; + } + + sel++; + } + } } // +--------------------------------------------------------------------+ @@ -651,14 +651,14 @@ NavDlg::SelectRegion(OrbitalRegion* rgn) void NavDlg::OnSelect(AWEvent* event) { - int index = -1; + int index = -1; - for (int i = 0; i < seln_list->NumItems(); i++) - if (seln_list->IsSelected(i)) - index = i; + for (int i = 0; i < seln_list->NumItems(); i++) + if (seln_list->IsSelected(i)) + index = i; - if (index >= 0) - SelectObject(index); + if (index >= 0) + SelectObject(index); } // +--------------------------------------------------------------------+ @@ -666,11 +666,11 @@ NavDlg::OnSelect(AWEvent* event) void NavDlg::SelectObject(int index) { - Text selected = seln_list->GetItemText(index); - int selection = seln_list->GetItemData(index); + Text selected = seln_list->GetItemText(index); + int selection = seln_list->GetItemData(index); - star_map->SetSelection(selection); - SetSystem(star_map->GetSystem()); + star_map->SetSelection(selection); + SetSystem(star_map->GetSystem()); } // +--------------------------------------------------------------------+ @@ -678,149 +678,149 @@ NavDlg::SelectObject(int index) void NavDlg::UpdateSelection() { - if (!info_list) - return; - - if (!star_map) - return; - - info_list->ClearItems(); - - Text units_km = Text(" ") + Game::GetText("NavDlg.units.kilometers"); - Text units_tonnes = Text(" ") + Game::GetText("NavDlg.units.tonnes"); - - if (seln_mode <= SELECT_REGION) { - Orbital* s = star_map->GetSelection(); - - if (s) { - char radius[32]; - char mass[32]; - char orbit[32]; - char period[32]; - char units[32]; - - double p = s->Period(); - - if (p < 60) { - sprintf(units, " %s", Game::GetText("NavDlg.units.seconds").data()); - } - else if (p < 3600) { - p /= 60; - sprintf(units, " %s", Game::GetText("NavDlg.units.minutes").data()); - } - else if (p < 24 * 3600) { - p /= 3600; - sprintf(units, " %s", Game::GetText("NavDlg.units.hours").data()); - } - else if (p < 365.25 * 24 * 3600) { - p /= 24*3600; - sprintf(units, " %s", Game::GetText("NavDlg.units.days").data()); - } - else { - p /= 365.25*24*3600; - sprintf(units, " %s", Game::GetText("NavDlg.units.years").data()); - } - - FormatNumberExp(radius, s->Radius()/1000); - FormatNumberExp(mass, s->Mass()/1000); - FormatNumberExp(orbit, s->Orbit()/1000); - FormatNumberExp(period, p); - - strcat(radius, units_km.data()); - strcat(mass, units_tonnes.data()); - strcat(orbit, units_km.data()); - strcat(period, units); - - if (seln_mode >= SELECT_SYSTEM) { - info_list->AddItem(Game::GetText(Text("NavDlg.filter.") + filter_name[seln_mode])); - info_list->AddItem(Game::GetText("NavDlg.radius")); - if (s->Mass() > 0) - info_list->AddItem(Game::GetText("NavDlg.mass")); - info_list->AddItem(Game::GetText("NavDlg.orbit")); - info_list->AddItem(Game::GetText("NavDlg.period")); - - int row = 0; - info_list->SetItemText(row++, 1, s->Name()); - info_list->SetItemText(row++, 1, radius); - if (s->Mass() > 0) - info_list->SetItemText(row++, 1, mass); - info_list->SetItemText(row++, 1, orbit); - info_list->SetItemText(row++, 1, period); - } - } - } - - else if (seln_mode == SELECT_STATION || - seln_mode == SELECT_STARSHIP || - seln_mode == SELECT_FIGHTER) { - - Ship* sel_ship = star_map->GetSelectedShip(); - MissionElement* sel_elem = star_map->GetSelectedElem(); - - if (sel_ship) { - Text order_desc = Game::GetText("NavDlg.none"); - char shield[16]; - char hull[16]; - char range[32]; - - sprintf(shield, "%03d", sel_ship->ShieldStrength()); - sprintf(hull, "%03d", sel_ship->HullStrength()); - sprintf(range, Game::GetText("NavDlg.not-avail").data()); - - if (ship) { - FormatNumberExp(range, Point(sel_ship->Location()-ship->Location()).length()/1000); - strcat(range, units_km.data()); - } - - info_list->AddItem(Game::GetText("NavDlg.name")); - info_list->AddItem(Game::GetText("NavDlg.class")); - info_list->AddItem(Game::GetText("NavDlg.sector")); - info_list->AddItem(Game::GetText("NavDlg.shield")); - info_list->AddItem(Game::GetText("NavDlg.hull")); - info_list->AddItem(Game::GetText("NavDlg.range")); - info_list->AddItem(Game::GetText("NavDlg.orders")); - - int row = 0; - info_list->SetItemText(row++, 1, sel_ship->Name()); - info_list->SetItemText(row++, 1, Text(sel_ship->Abbreviation()) + Text(" ") + Text(sel_ship->Design()->display_name)); - info_list->SetItemText(row++, 1, sel_ship->GetRegion()->Name()); - info_list->SetItemText(row++, 1, shield); - info_list->SetItemText(row++, 1, hull); - info_list->SetItemText(row++, 1, range); - info_list->SetItemText(row++, 1, order_desc); - } - - else if (sel_elem) { - Text order_desc = Game::GetText("NavDlg.none"); - char range[32]; - - MissionElement* self = mission->GetElements()[0]; - if (self) - FormatNumberExp(range, Point(sel_elem->Location()-self->Location()).length()/1000); - else - strcpy(range, "0"); - - strcat(range, units_km.data()); - - info_list->AddItem(Game::GetText("NavDlg.name")); - info_list->AddItem(Game::GetText("NavDlg.class")); - info_list->AddItem(Game::GetText("NavDlg.sector")); - info_list->AddItem(Game::GetText("NavDlg.range")); - info_list->AddItem(Game::GetText("NavDlg.orders")); - - int row = 0; - info_list->SetItemText(row++, 1, sel_elem->Name()); - - if (sel_elem->GetDesign()) - info_list->SetItemText(row++, 1, sel_elem->Abbreviation() + Text(" ") + sel_elem->GetDesign()->name); - else - info_list->SetItemText(row++, 1, Game::GetText("NavDlg.unknown")); - - info_list->SetItemText(row++, 1, sel_elem->Region()); - info_list->SetItemText(row++, 1, range); - info_list->SetItemText(row++, 1, order_desc); - } - } + if (!info_list) + return; + + if (!star_map) + return; + + info_list->ClearItems(); + + Text units_km = Text(" ") + Game::GetText("NavDlg.units.kilometers"); + Text units_tonnes = Text(" ") + Game::GetText("NavDlg.units.tonnes"); + + if (seln_mode <= SELECT_REGION) { + Orbital* s = star_map->GetSelection(); + + if (s) { + char radius[32]; + char mass[32]; + char orbit[32]; + char period[32]; + char units[32]; + + double p = s->Period(); + + if (p < 60) { + sprintf(units, " %s", Game::GetText("NavDlg.units.seconds").data()); + } + else if (p < 3600) { + p /= 60; + sprintf(units, " %s", Game::GetText("NavDlg.units.minutes").data()); + } + else if (p < 24 * 3600) { + p /= 3600; + sprintf(units, " %s", Game::GetText("NavDlg.units.hours").data()); + } + else if (p < 365.25 * 24 * 3600) { + p /= 24*3600; + sprintf(units, " %s", Game::GetText("NavDlg.units.days").data()); + } + else { + p /= 365.25*24*3600; + sprintf(units, " %s", Game::GetText("NavDlg.units.years").data()); + } + + FormatNumberExp(radius, s->Radius()/1000); + FormatNumberExp(mass, s->Mass()/1000); + FormatNumberExp(orbit, s->Orbit()/1000); + FormatNumberExp(period, p); + + strcat(radius, units_km.data()); + strcat(mass, units_tonnes.data()); + strcat(orbit, units_km.data()); + strcat(period, units); + + if (seln_mode >= SELECT_SYSTEM) { + info_list->AddItem(Game::GetText(Text("NavDlg.filter.") + filter_name[seln_mode])); + info_list->AddItem(Game::GetText("NavDlg.radius")); + if (s->Mass() > 0) + info_list->AddItem(Game::GetText("NavDlg.mass")); + info_list->AddItem(Game::GetText("NavDlg.orbit")); + info_list->AddItem(Game::GetText("NavDlg.period")); + + int row = 0; + info_list->SetItemText(row++, 1, s->Name()); + info_list->SetItemText(row++, 1, radius); + if (s->Mass() > 0) + info_list->SetItemText(row++, 1, mass); + info_list->SetItemText(row++, 1, orbit); + info_list->SetItemText(row++, 1, period); + } + } + } + + else if (seln_mode == SELECT_STATION || + seln_mode == SELECT_STARSHIP || + seln_mode == SELECT_FIGHTER) { + + Ship* sel_ship = star_map->GetSelectedShip(); + MissionElement* sel_elem = star_map->GetSelectedElem(); + + if (sel_ship) { + Text order_desc = Game::GetText("NavDlg.none"); + char shield[16]; + char hull[16]; + char range[32]; + + sprintf(shield, "%03d", sel_ship->ShieldStrength()); + sprintf(hull, "%03d", sel_ship->HullStrength()); + sprintf(range, Game::GetText("NavDlg.not-avail").data()); + + if (ship) { + FormatNumberExp(range, Point(sel_ship->Location()-ship->Location()).length()/1000); + strcat(range, units_km.data()); + } + + info_list->AddItem(Game::GetText("NavDlg.name")); + info_list->AddItem(Game::GetText("NavDlg.class")); + info_list->AddItem(Game::GetText("NavDlg.sector")); + info_list->AddItem(Game::GetText("NavDlg.shield")); + info_list->AddItem(Game::GetText("NavDlg.hull")); + info_list->AddItem(Game::GetText("NavDlg.range")); + info_list->AddItem(Game::GetText("NavDlg.orders")); + + int row = 0; + info_list->SetItemText(row++, 1, sel_ship->Name()); + info_list->SetItemText(row++, 1, Text(sel_ship->Abbreviation()) + Text(" ") + Text(sel_ship->Design()->display_name)); + info_list->SetItemText(row++, 1, sel_ship->GetRegion()->Name()); + info_list->SetItemText(row++, 1, shield); + info_list->SetItemText(row++, 1, hull); + info_list->SetItemText(row++, 1, range); + info_list->SetItemText(row++, 1, order_desc); + } + + else if (sel_elem) { + Text order_desc = Game::GetText("NavDlg.none"); + char range[32]; + + MissionElement* self = mission->GetElements()[0]; + if (self) + FormatNumberExp(range, Point(sel_elem->Location()-self->Location()).length()/1000); + else + strcpy(range, "0"); + + strcat(range, units_km.data()); + + info_list->AddItem(Game::GetText("NavDlg.name")); + info_list->AddItem(Game::GetText("NavDlg.class")); + info_list->AddItem(Game::GetText("NavDlg.sector")); + info_list->AddItem(Game::GetText("NavDlg.range")); + info_list->AddItem(Game::GetText("NavDlg.orders")); + + int row = 0; + info_list->SetItemText(row++, 1, sel_elem->Name()); + + if (sel_elem->GetDesign()) + info_list->SetItemText(row++, 1, sel_elem->Abbreviation() + Text(" ") + sel_elem->GetDesign()->name); + else + info_list->SetItemText(row++, 1, Game::GetText("NavDlg.unknown")); + + info_list->SetItemText(row++, 1, sel_elem->Region()); + info_list->SetItemText(row++, 1, range); + info_list->SetItemText(row++, 1, order_desc); + } + } } // +--------------------------------------------------------------------+ @@ -828,125 +828,125 @@ NavDlg::UpdateSelection() void NavDlg::UpdateLists() { - if (!seln_list) - return; - - int seln_index = -1; - int top_index = -1; - - if (seln_list->IsSelecting()) - seln_index = seln_list->GetListIndex(); - - top_index = seln_list->GetTopIndex(); - - seln_list->ClearItems(); - - switch (seln_mode) { - case SELECT_SYSTEM: - { - seln_list->SetColumnTitle(0, Game::GetText(Text("NavDlg.filter.") + filter_name[seln_mode])); - int i = 0; - ListIter iter = star_map->GetGalaxy(); - while (++iter) - seln_list->AddItemWithData(iter->Name(), i++); - } - break; - - case SELECT_PLANET: - { - seln_list->SetColumnTitle(0, Game::GetText(Text("NavDlg.filter.") + filter_name[seln_mode])); - int i = 0; - ListIter iter = planets; - while (++iter) { - if (iter->Type() == Orbital::MOON) - seln_list->AddItemWithData(Text("- ") + Text(iter->Name()), i++); - else - seln_list->AddItemWithData(iter->Name(), i++); - } - } - break; - - case SELECT_REGION: - { - seln_list->SetColumnTitle(0, Game::GetText(Text("NavDlg.filter.") + filter_name[seln_mode])); - int i = 0; - ListIter iter = regions; - while (++iter) { - seln_list->AddItemWithData(iter->Name(), i++); - } - } - break; - - case SELECT_STATION: - case SELECT_STARSHIP: - case SELECT_FIGHTER: - { - seln_list->SetColumnTitle(0, Game::GetText(Text("NavDlg.filter.") + filter_name[seln_mode])); - int i = 0; - - if (mission) { - ListIter elem = mission->GetElements(); - while (++elem) { - MissionElement* e = elem.value(); - bool filter_ok = - (seln_mode == SELECT_STATION && e->IsStatic()) || - (seln_mode == SELECT_STARSHIP && e->IsStarship() && !e->IsStatic()) || - (seln_mode == SELECT_FIGHTER && e->IsDropship() && !e->IsSquadron()); - - if (filter_ok) { - bool visible = editor || - e->GetIFF() == 0 || - e->GetIFF() == mission->Team() || - e->IntelLevel() > Intel::KNOWN; - - if (visible) - seln_list->AddItemWithData(e->Name(), e->Identity()); - } - } - } - - else if (ship) { - Sim* sim = Sim::GetSim(); - ListIter r_iter = sim->GetRegions(); - while (++r_iter) { - SimRegion* rgn = r_iter.value(); - - ListIter s_iter = rgn->Ships(); - while (++s_iter) { - Ship* s = s_iter.value(); - bool filter_ok = - (seln_mode == SELECT_STATION && s->IsStatic()) || - (seln_mode == SELECT_STARSHIP && s->IsStarship() && !s->IsStatic()) || - (seln_mode == SELECT_FIGHTER && s->IsDropship()); - - - if (filter_ok) { - bool visible = s->GetIFF() == 0 || - s->GetIFF() == ship->GetIFF() || - s->GetElement() && - s->GetElement()->IntelLevel() > Intel::KNOWN; - - if (visible) - seln_list->AddItemWithData(s->Name(), s->Identity()); - } - } - } - } - } - break; - - default: - break; - } - - if (top_index >= 0) - seln_list->ScrollTo(top_index); - - if (seln_index >= 0) - seln_list->SetSelected(seln_index); - - else - CoordinateSelection(); + if (!seln_list) + return; + + int seln_index = -1; + int top_index = -1; + + if (seln_list->IsSelecting()) + seln_index = seln_list->GetListIndex(); + + top_index = seln_list->GetTopIndex(); + + seln_list->ClearItems(); + + switch (seln_mode) { + case SELECT_SYSTEM: + { + seln_list->SetColumnTitle(0, Game::GetText(Text("NavDlg.filter.") + filter_name[seln_mode])); + int i = 0; + ListIter iter = star_map->GetGalaxy(); + while (++iter) + seln_list->AddItemWithData(iter->Name(), i++); + } + break; + + case SELECT_PLANET: + { + seln_list->SetColumnTitle(0, Game::GetText(Text("NavDlg.filter.") + filter_name[seln_mode])); + int i = 0; + ListIter iter = planets; + while (++iter) { + if (iter->Type() == Orbital::MOON) + seln_list->AddItemWithData(Text("- ") + Text(iter->Name()), i++); + else + seln_list->AddItemWithData(iter->Name(), i++); + } + } + break; + + case SELECT_REGION: + { + seln_list->SetColumnTitle(0, Game::GetText(Text("NavDlg.filter.") + filter_name[seln_mode])); + int i = 0; + ListIter iter = regions; + while (++iter) { + seln_list->AddItemWithData(iter->Name(), i++); + } + } + break; + + case SELECT_STATION: + case SELECT_STARSHIP: + case SELECT_FIGHTER: + { + seln_list->SetColumnTitle(0, Game::GetText(Text("NavDlg.filter.") + filter_name[seln_mode])); + int i = 0; + + if (mission) { + ListIter elem = mission->GetElements(); + while (++elem) { + MissionElement* e = elem.value(); + bool filter_ok = + (seln_mode == SELECT_STATION && e->IsStatic()) || + (seln_mode == SELECT_STARSHIP && e->IsStarship() && !e->IsStatic()) || + (seln_mode == SELECT_FIGHTER && e->IsDropship() && !e->IsSquadron()); + + if (filter_ok) { + bool visible = editor || + e->GetIFF() == 0 || + e->GetIFF() == mission->Team() || + e->IntelLevel() > Intel::KNOWN; + + if (visible) + seln_list->AddItemWithData(e->Name(), e->Identity()); + } + } + } + + else if (ship) { + Sim* sim = Sim::GetSim(); + ListIter r_iter = sim->GetRegions(); + while (++r_iter) { + SimRegion* rgn = r_iter.value(); + + ListIter s_iter = rgn->Ships(); + while (++s_iter) { + Ship* s = s_iter.value(); + bool filter_ok = + (seln_mode == SELECT_STATION && s->IsStatic()) || + (seln_mode == SELECT_STARSHIP && s->IsStarship() && !s->IsStatic()) || + (seln_mode == SELECT_FIGHTER && s->IsDropship()); + + + if (filter_ok) { + bool visible = s->GetIFF() == 0 || + s->GetIFF() == ship->GetIFF() || + s->GetElement() && + s->GetElement()->IntelLevel() > Intel::KNOWN; + + if (visible) + seln_list->AddItemWithData(s->Name(), s->Identity()); + } + } + } + } + } + break; + + default: + break; + } + + if (top_index >= 0) + seln_list->ScrollTo(top_index); + + if (seln_index >= 0) + seln_list->SetSelected(seln_index); + + else + CoordinateSelection(); } // +--------------------------------------------------------------------+ @@ -954,31 +954,31 @@ NavDlg::UpdateLists() void NavDlg::OnEngage(AWEvent* event) { - bool hide = false; - - if (ship) { - NavSystem* navsys = ship->GetNavSystem(); - if (navsys) { - if (navsys->AutoNavEngaged()) { - navsys->DisengageAutoNav(); - commit_btn->SetText(Game::GetText("NavDlg.commit")); - commit_btn->SetBackColor(commit_color); - } - else { - navsys->EngageAutoNav(); - commit_btn->SetText(Game::GetText("NavDlg.cancel")); - commit_btn->SetBackColor(cancel_color); - hide = true; - } - - Sim* sim = Sim::GetSim(); - if (sim) - ship->SetControls(sim->GetControls()); - } - } - - if (manager && hide) - manager->ShowNavDlg(); // also hides + bool hide = false; + + if (ship) { + NavSystem* navsys = ship->GetNavSystem(); + if (navsys) { + if (navsys->AutoNavEngaged()) { + navsys->DisengageAutoNav(); + commit_btn->SetText(Game::GetText("NavDlg.commit")); + commit_btn->SetBackColor(commit_color); + } + else { + navsys->EngageAutoNav(); + commit_btn->SetText(Game::GetText("NavDlg.cancel")); + commit_btn->SetBackColor(cancel_color); + hide = true; + } + + Sim* sim = Sim::GetSim(); + if (sim) + ship->SetControls(sim->GetControls()); + } + } + + if (manager && hide) + manager->ShowNavDlg(); // also hides } // +--------------------------------------------------------------------+ @@ -986,8 +986,8 @@ NavDlg::OnEngage(AWEvent* event) void NavDlg::OnCommit(AWEvent* event) { - if (manager) - manager->ShowNavDlg(); // also hides + if (manager) + manager->ShowNavDlg(); // also hides } @@ -996,8 +996,8 @@ NavDlg::OnCommit(AWEvent* event) void NavDlg::OnCancel(AWEvent* event) { - if (manager) - manager->ShowNavDlg(); // also hides + if (manager) + manager->ShowNavDlg(); // also hides } // +--------------------------------------------------------------------+ @@ -1005,26 +1005,26 @@ NavDlg::OnCancel(AWEvent* event) void NavDlg::SetNavEditMode(int mode) { - if (nav_edit_mode != mode) { - if (mode != NAV_EDIT_NONE) { - int map_mode = star_map->GetSelectionMode(); - if (map_mode != -1) - seln_mode = map_mode; - - star_map->SetSelectionMode(-1); - } - else { - star_map->SetSelectionMode(seln_mode); - } - - nav_edit_mode = mode; - } + if (nav_edit_mode != mode) { + if (mode != NAV_EDIT_NONE) { + int map_mode = star_map->GetSelectionMode(); + if (map_mode != -1) + seln_mode = map_mode; + + star_map->SetSelectionMode(-1); + } + else { + star_map->SetSelectionMode(seln_mode); + } + + nav_edit_mode = mode; + } } int NavDlg::GetNavEditMode() { - return nav_edit_mode; + return nav_edit_mode; } void @@ -1040,80 +1040,80 @@ NavDlg::OnMapMove(AWEvent* event) void NavDlg::OnMapClick(AWEvent* event) { - static DWORD click_time = 0; + static DWORD click_time = 0; - SetSystem(star_map->GetSystem()); - CoordinateSelection(); + SetSystem(star_map->GetSystem()); + CoordinateSelection(); - // double-click: - if (Game::RealTime() - click_time < 350) { - MissionElement* elem = star_map->GetSelectedElem(); - MsnElemDlg* msn_elem_dlg = manager->GetMsnElemDlg(); + // double-click: + if (Game::RealTime() - click_time < 350) { + MissionElement* elem = star_map->GetSelectedElem(); + MsnElemDlg* msn_elem_dlg = manager->GetMsnElemDlg(); - if (elem && msn_elem_dlg) { - msn_elem_dlg->SetMission(mission); - msn_elem_dlg->SetMissionElement(elem); - manager->ShowMsnElemDlg(); - } - } + if (elem && msn_elem_dlg) { + msn_elem_dlg->SetMission(mission); + msn_elem_dlg->SetMissionElement(elem); + manager->ShowMsnElemDlg(); + } + } - click_time = Game::RealTime(); + click_time = Game::RealTime(); } void NavDlg::CoordinateSelection() { - if (!seln_list || !star_map) - return; - - switch (seln_mode) { - default: - case SELECT_SYSTEM: - case SELECT_PLANET: - case SELECT_REGION: - { - seln_list->ClearSelection(); - - Orbital* selected = star_map->GetSelection(); - - if (selected) { - for (int i = 0; i < seln_list->NumItems(); i++) { - if (seln_list->GetItemText(i) == selected->Name() || - seln_list->GetItemText(i) == Text("- ") + selected->Name()) { - seln_list->SetSelected(i, true); - } - } - } - } - break; - - case SELECT_STATION: - case SELECT_STARSHIP: - case SELECT_FIGHTER: - { - seln_list->ClearSelection(); - - Ship* selected = star_map->GetSelectedShip(); - MissionElement* elem = star_map->GetSelectedElem(); - - if (selected) { - for (int i = 0; i < seln_list->NumItems(); i++) { - if (seln_list->GetItemText(i) == selected->Name()) { - seln_list->SetSelected(i, true); - } - } - } - - else if (elem) { - for (int i = 0; i < seln_list->NumItems(); i++) { - if (seln_list->GetItemText(i) == elem->Name()) { - seln_list->SetSelected(i, true); - } - } - } - } - break; - } + if (!seln_list || !star_map) + return; + + switch (seln_mode) { + default: + case SELECT_SYSTEM: + case SELECT_PLANET: + case SELECT_REGION: + { + seln_list->ClearSelection(); + + Orbital* selected = star_map->GetSelection(); + + if (selected) { + for (int i = 0; i < seln_list->NumItems(); i++) { + if (seln_list->GetItemText(i) == selected->Name() || + seln_list->GetItemText(i) == Text("- ") + selected->Name()) { + seln_list->SetSelected(i, true); + } + } + } + } + break; + + case SELECT_STATION: + case SELECT_STARSHIP: + case SELECT_FIGHTER: + { + seln_list->ClearSelection(); + + Ship* selected = star_map->GetSelectedShip(); + MissionElement* elem = star_map->GetSelectedElem(); + + if (selected) { + for (int i = 0; i < seln_list->NumItems(); i++) { + if (seln_list->GetItemText(i) == selected->Name()) { + seln_list->SetSelected(i, true); + } + } + } + + else if (elem) { + for (int i = 0; i < seln_list->NumItems(); i++) { + if (seln_list->GetItemText(i) == elem->Name()) { + seln_list->SetSelected(i, true); + } + } + } + } + break; + } } // +--------------------------------------------------------------------+ @@ -1121,6 +1121,6 @@ NavDlg::CoordinateSelection() void NavDlg::OnClose(AWEvent* event) { - if (manager) - manager->HideNavDlg(); + if (manager) + manager->HideNavDlg(); } -- cgit v1.1