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/CtlDlg.cpp | 474 ++++++++++++++++++++++++++--------------------------- 1 file changed, 237 insertions(+), 237 deletions(-) (limited to 'Stars45/CtlDlg.cpp') diff --git a/Stars45/CtlDlg.cpp b/Stars45/CtlDlg.cpp index 230cc29..8463c38 100644 --- a/Stars45/CtlDlg.cpp +++ b/Stars45/CtlDlg.cpp @@ -1,15 +1,15 @@ /* Project Starshatter 4.5 - Destroyer Studios LLC - Copyright © 1997-2004. All Rights Reserved. + Destroyer Studios LLC + Copyright © 1997-2004. All Rights Reserved. - SUBSYSTEM: Stars.exe - FILE: CtlDlg.cpp - AUTHOR: John DiCamillo + SUBSYSTEM: Stars.exe + FILE: CtlDlg.cpp + AUTHOR: John DiCamillo - OVERVIEW - ======== - Control Options (keyboard/joystick) Dialog Active Window class + OVERVIEW + ======== + Control Options (keyboard/joystick) Dialog Active Window class */ #include "MemDebug.h" @@ -54,14 +54,14 @@ DEF_MAP_CLIENT(CtlDlg, OnMod); // +--------------------------------------------------------------------+ CtlDlg::CtlDlg(Screen* s, FormDef& def, BaseScreen* mgr) - : FormWindow(s, 0, 0, s->Width(), s->Height()), manager(mgr), - selected_category(0), command_index(0), control_model(0), - joy_select(0), joy_throttle(0), joy_rudder(0), joy_sensitivity(0), - mouse_select(0), mouse_sensitivity(0), mouse_invert(0), - apply(0), cancel(0), vid_btn(0), aud_btn(0), ctl_btn(0), opt_btn(0), mod_btn(0), - closed(true) +: FormWindow(s, 0, 0, s->Width(), s->Height()), manager(mgr), +selected_category(0), command_index(0), control_model(0), +joy_select(0), joy_throttle(0), joy_rudder(0), joy_sensitivity(0), +mouse_select(0), mouse_sensitivity(0), mouse_invert(0), +apply(0), cancel(0), vid_btn(0), aud_btn(0), ctl_btn(0), opt_btn(0), mod_btn(0), +closed(true) { - Init(def); + Init(def); } CtlDlg::~CtlDlg() @@ -73,77 +73,77 @@ CtlDlg::~CtlDlg() void CtlDlg::RegisterControls() { - if (apply) - return; + if (apply) + return; - for (int i = 0; i < 4; i++) { - category[i] = (Button*) FindControl(101 + i); - REGISTER_CLIENT(EID_CLICK, category[i], CtlDlg, OnCategory); - } + for (int i = 0; i < 4; i++) { + category[i] = (Button*) FindControl(101 + i); + REGISTER_CLIENT(EID_CLICK, category[i], CtlDlg, OnCategory); + } - commands = (ListBox*) FindControl(200); - REGISTER_CLIENT(EID_SELECT, commands, CtlDlg, OnCommand); + commands = (ListBox*) FindControl(200); + REGISTER_CLIENT(EID_SELECT, commands, CtlDlg, OnCommand); - control_model_combo = (ComboBox*) FindControl(210); - REGISTER_CLIENT(EID_SELECT, control_model_combo, CtlDlg, OnControlModel); + control_model_combo = (ComboBox*) FindControl(210); + REGISTER_CLIENT(EID_SELECT, control_model_combo, CtlDlg, OnControlModel); - joy_select_combo = (ComboBox*) FindControl(211); - REGISTER_CLIENT(EID_SELECT, joy_select_combo, CtlDlg, OnJoySelect); + joy_select_combo = (ComboBox*) FindControl(211); + REGISTER_CLIENT(EID_SELECT, joy_select_combo, CtlDlg, OnJoySelect); - joy_throttle_combo = (ComboBox*) FindControl(212); - REGISTER_CLIENT(EID_SELECT, joy_throttle_combo, CtlDlg, OnJoyThrottle); + joy_throttle_combo = (ComboBox*) FindControl(212); + REGISTER_CLIENT(EID_SELECT, joy_throttle_combo, CtlDlg, OnJoyThrottle); - joy_rudder_combo = (ComboBox*) FindControl(213); - REGISTER_CLIENT(EID_SELECT, joy_rudder_combo, CtlDlg, OnJoyRudder); + joy_rudder_combo = (ComboBox*) FindControl(213); + REGISTER_CLIENT(EID_SELECT, joy_rudder_combo, CtlDlg, OnJoyRudder); - joy_sensitivity_slider = (Slider*) FindControl(214); + joy_sensitivity_slider = (Slider*) FindControl(214); - if (joy_sensitivity_slider) { - joy_sensitivity_slider->SetRangeMin(0); - joy_sensitivity_slider->SetRangeMax(10); - joy_sensitivity_slider->SetStepSize(1); - REGISTER_CLIENT(EID_CLICK, joy_sensitivity_slider, CtlDlg, OnJoySensitivity); - } + if (joy_sensitivity_slider) { + joy_sensitivity_slider->SetRangeMin(0); + joy_sensitivity_slider->SetRangeMax(10); + joy_sensitivity_slider->SetStepSize(1); + REGISTER_CLIENT(EID_CLICK, joy_sensitivity_slider, CtlDlg, OnJoySensitivity); + } - joy_axis_button = (Button*) FindControl(215); - REGISTER_CLIENT(EID_CLICK, joy_axis_button, CtlDlg, OnJoyAxis); + joy_axis_button = (Button*) FindControl(215); + REGISTER_CLIENT(EID_CLICK, joy_axis_button, CtlDlg, OnJoyAxis); - mouse_select_combo = (ComboBox*) FindControl(511); - REGISTER_CLIENT(EID_SELECT, mouse_select_combo, CtlDlg, OnMouseSelect); + mouse_select_combo = (ComboBox*) FindControl(511); + REGISTER_CLIENT(EID_SELECT, mouse_select_combo, CtlDlg, OnMouseSelect); - mouse_sensitivity_slider = (Slider*) FindControl(514); - if (mouse_sensitivity_slider) { - mouse_sensitivity_slider->SetRangeMin(0); - mouse_sensitivity_slider->SetRangeMax(50); - mouse_sensitivity_slider->SetStepSize(1); - REGISTER_CLIENT(EID_CLICK, mouse_sensitivity_slider, CtlDlg, OnMouseSensitivity); - } + mouse_sensitivity_slider = (Slider*) FindControl(514); + if (mouse_sensitivity_slider) { + mouse_sensitivity_slider->SetRangeMin(0); + mouse_sensitivity_slider->SetRangeMax(50); + mouse_sensitivity_slider->SetStepSize(1); + REGISTER_CLIENT(EID_CLICK, mouse_sensitivity_slider, CtlDlg, OnMouseSensitivity); + } - mouse_invert_checkbox = (Button*) FindControl(515); - REGISTER_CLIENT(EID_CLICK, mouse_invert_checkbox, CtlDlg, OnMouseInvert); + mouse_invert_checkbox = (Button*) FindControl(515); + REGISTER_CLIENT(EID_CLICK, mouse_invert_checkbox, CtlDlg, OnMouseInvert); - apply = (Button*) FindControl(1); - REGISTER_CLIENT(EID_CLICK, apply, CtlDlg, OnApply); + apply = (Button*) FindControl(1); + REGISTER_CLIENT(EID_CLICK, apply, CtlDlg, OnApply); - cancel = (Button*) FindControl(2); - REGISTER_CLIENT(EID_CLICK, cancel, CtlDlg, OnCancel); + cancel = (Button*) FindControl(2); + REGISTER_CLIENT(EID_CLICK, cancel, CtlDlg, OnCancel); - vid_btn = (Button*) FindControl(901); - REGISTER_CLIENT(EID_CLICK, vid_btn, CtlDlg, OnVideo); + vid_btn = (Button*) FindControl(901); + REGISTER_CLIENT(EID_CLICK, vid_btn, CtlDlg, OnVideo); - aud_btn = (Button*) FindControl(902); - REGISTER_CLIENT(EID_CLICK, aud_btn, CtlDlg, OnAudio); + aud_btn = (Button*) FindControl(902); + REGISTER_CLIENT(EID_CLICK, aud_btn, CtlDlg, OnAudio); - ctl_btn = (Button*) FindControl(903); - REGISTER_CLIENT(EID_CLICK, ctl_btn, CtlDlg, OnControls); + ctl_btn = (Button*) FindControl(903); + REGISTER_CLIENT(EID_CLICK, ctl_btn, CtlDlg, OnControls); - opt_btn = (Button*) FindControl(904); - REGISTER_CLIENT(EID_CLICK, opt_btn, CtlDlg, OnOptions); + opt_btn = (Button*) FindControl(904); + REGISTER_CLIENT(EID_CLICK, opt_btn, CtlDlg, OnOptions); - mod_btn = (Button*) FindControl(905); - if (mod_btn) { - REGISTER_CLIENT(EID_CLICK, mod_btn, CtlDlg, OnMod); - } + mod_btn = (Button*) FindControl(905); + if (mod_btn) { + REGISTER_CLIENT(EID_CLICK, mod_btn, CtlDlg, OnMod); + } } // +--------------------------------------------------------------------+ @@ -151,21 +151,21 @@ CtlDlg::RegisterControls() void CtlDlg::Show() { - if (!IsShown()) - FormWindow::Show(); + if (!IsShown()) + FormWindow::Show(); - if (closed) - ShowCategory(); - else - UpdateCategory(); + if (closed) + ShowCategory(); + else + UpdateCategory(); - if (vid_btn) vid_btn->SetButtonState(0); - if (aud_btn) aud_btn->SetButtonState(0); - if (ctl_btn) ctl_btn->SetButtonState(1); - if (opt_btn) opt_btn->SetButtonState(0); - if (mod_btn) mod_btn->SetButtonState(0); + if (vid_btn) vid_btn->SetButtonState(0); + if (aud_btn) aud_btn->SetButtonState(0); + if (ctl_btn) ctl_btn->SetButtonState(1); + if (opt_btn) opt_btn->SetButtonState(0); + if (mod_btn) mod_btn->SetButtonState(0); - closed = false; + closed = false; } // +--------------------------------------------------------------------+ @@ -173,9 +173,9 @@ CtlDlg::Show() void CtlDlg::ExecFrame() { - if (Keyboard::KeyDown(VK_RETURN)) { - OnApply(0); - } + if (Keyboard::KeyDown(VK_RETURN)) { + OnApply(0); + } } // +--------------------------------------------------------------------+ @@ -183,99 +183,99 @@ CtlDlg::ExecFrame() void CtlDlg::ShowCategory() { - if (!commands || !category[0]) - return; - - for (int i = 0; i < 4; i++) { - if (i == selected_category) - category[i]->SetButtonState(1); - else - category[i]->SetButtonState(0); - } - - commands->ClearItems(); - commands->SetSelectedStyle(ListBox::LIST_ITEM_STYLE_FILLED_BOX); - commands->SetLeading(2); - - Starshatter* stars = Starshatter::GetInstance(); - - if (stars) { - KeyMap& keymap = stars->GetKeyMap(); - int n = 0; - - for (int i = 0; i < 256; i++) { - KeyMapEntry* k = keymap.GetKeyMap(i); - - switch (k->act) { - case 0: - break; - - case KEY_CONTROL_MODEL: - control_model = k->key; - control_model_combo->SetSelection(control_model); - break; - - case KEY_JOY_SELECT: - joy_select = k->key; - joy_select_combo->SetSelection(joy_select); - break; - - case KEY_JOY_RUDDER: - joy_rudder = k->key; - joy_rudder_combo->SetSelection(joy_rudder); - break; - - case KEY_JOY_THROTTLE: - joy_throttle = k->key; - joy_throttle_combo->SetSelection(joy_throttle); - break; - - case KEY_JOY_SENSE: - joy_sensitivity = k->key; - joy_sensitivity_slider->SetValue(joy_sensitivity); - break; - - case KEY_JOY_SWAP: - break; - - case KEY_JOY_DEAD_ZONE: - break; - - case KEY_MOUSE_SELECT: - mouse_select = k->key; - mouse_select_combo->SetSelection(mouse_select); - break; - - case KEY_MOUSE_SENSE: - mouse_sensitivity = k->key; - mouse_sensitivity_slider->SetValue(mouse_sensitivity); - break; - - case KEY_MOUSE_INVERT: - mouse_invert = k->key; - mouse_invert_checkbox->SetButtonState(mouse_invert > 0); - break; - - case KEY_AXIS_YAW: - case KEY_AXIS_PITCH: - case KEY_AXIS_ROLL: - case KEY_AXIS_THROTTLE: - - case KEY_AXIS_YAW_INVERT: - case KEY_AXIS_PITCH_INVERT: - case KEY_AXIS_ROLL_INVERT: - case KEY_AXIS_THROTTLE_INVERT: - break; - - default: - if (keymap.GetCategory(i) == selected_category) { - commands->AddItemWithData(keymap.DescribeAction(i), (DWORD) i); - commands->SetItemText(n++, 1, keymap.DescribeKey(i)); - } - break; - } - } - } + if (!commands || !category[0]) + return; + + for (int i = 0; i < 4; i++) { + if (i == selected_category) + category[i]->SetButtonState(1); + else + category[i]->SetButtonState(0); + } + + commands->ClearItems(); + commands->SetSelectedStyle(ListBox::LIST_ITEM_STYLE_FILLED_BOX); + commands->SetLeading(2); + + Starshatter* stars = Starshatter::GetInstance(); + + if (stars) { + KeyMap& keymap = stars->GetKeyMap(); + int n = 0; + + for (int i = 0; i < 256; i++) { + KeyMapEntry* k = keymap.GetKeyMap(i); + + switch (k->act) { + case 0: + break; + + case KEY_CONTROL_MODEL: + control_model = k->key; + control_model_combo->SetSelection(control_model); + break; + + case KEY_JOY_SELECT: + joy_select = k->key; + joy_select_combo->SetSelection(joy_select); + break; + + case KEY_JOY_RUDDER: + joy_rudder = k->key; + joy_rudder_combo->SetSelection(joy_rudder); + break; + + case KEY_JOY_THROTTLE: + joy_throttle = k->key; + joy_throttle_combo->SetSelection(joy_throttle); + break; + + case KEY_JOY_SENSE: + joy_sensitivity = k->key; + joy_sensitivity_slider->SetValue(joy_sensitivity); + break; + + case KEY_JOY_SWAP: + break; + + case KEY_JOY_DEAD_ZONE: + break; + + case KEY_MOUSE_SELECT: + mouse_select = k->key; + mouse_select_combo->SetSelection(mouse_select); + break; + + case KEY_MOUSE_SENSE: + mouse_sensitivity = k->key; + mouse_sensitivity_slider->SetValue(mouse_sensitivity); + break; + + case KEY_MOUSE_INVERT: + mouse_invert = k->key; + mouse_invert_checkbox->SetButtonState(mouse_invert > 0); + break; + + case KEY_AXIS_YAW: + case KEY_AXIS_PITCH: + case KEY_AXIS_ROLL: + case KEY_AXIS_THROTTLE: + + case KEY_AXIS_YAW_INVERT: + case KEY_AXIS_PITCH_INVERT: + case KEY_AXIS_ROLL_INVERT: + case KEY_AXIS_THROTTLE_INVERT: + break; + + default: + if (keymap.GetCategory(i) == selected_category) { + commands->AddItemWithData(keymap.DescribeAction(i), (DWORD) i); + commands->SetItemText(n++, 1, keymap.DescribeKey(i)); + } + break; + } + } + } } // +--------------------------------------------------------------------+ @@ -283,16 +283,16 @@ CtlDlg::ShowCategory() void CtlDlg::UpdateCategory() { - if (!commands) - return; - - Starshatter* stars = Starshatter::GetInstance(); - KeyMap& keymap = stars->GetKeyMap(); - - for (int i = 0; i < commands->NumItems(); i++) { - int key = commands->GetItemData(i); - commands->SetItemText(i, 1, keymap.DescribeKey(key)); - } + if (!commands) + return; + + Starshatter* stars = Starshatter::GetInstance(); + KeyMap& keymap = stars->GetKeyMap(); + + for (int i = 0; i < commands->NumItems(); i++) { + int key = commands->GetItemData(i); + commands->SetItemText(i, 1, keymap.DescribeKey(key)); + } } // +--------------------------------------------------------------------+ @@ -300,13 +300,13 @@ CtlDlg::UpdateCategory() void CtlDlg::OnCategory(AWEvent* event) { - selected_category = 0; + selected_category = 0; - for (int i = 0; i < 4; i++) - if (event->window == category[i]) - selected_category = i; + for (int i = 0; i < 4; i++) + if (event->window == category[i]) + selected_category = i; - ShowCategory(); + ShowCategory(); } // +--------------------------------------------------------------------+ @@ -316,25 +316,25 @@ static DWORD command_click_time = 0; void CtlDlg::OnCommand(AWEvent* event) { - int list_index = commands->GetListIndex(); + int list_index = commands->GetListIndex(); - // double-click: - if (list_index == command_index && Game::RealTime() - command_click_time < 350) { - KeyDlg* key_dlg = 0; - - if (manager) - key_dlg = manager->GetKeyDlg(); + // double-click: + if (list_index == command_index && Game::RealTime() - command_click_time < 350) { + KeyDlg* key_dlg = 0; + + if (manager) + key_dlg = manager->GetKeyDlg(); - if (key_dlg) { - key_dlg->SetKeyMapIndex(commands->GetItemData(list_index)); - } + if (key_dlg) { + key_dlg->SetKeyMapIndex(commands->GetItemData(list_index)); + } - if (manager) - manager->ShowKeyDlg(); - } + if (manager) + manager->ShowKeyDlg(); + } - command_click_time = Game::RealTime(); - command_index = list_index; + command_click_time = Game::RealTime(); + command_index = list_index; } // +--------------------------------------------------------------------+ @@ -342,7 +342,7 @@ CtlDlg::OnCommand(AWEvent* event) void CtlDlg::OnControlModel(AWEvent* event) { - control_model = control_model_combo->GetSelectedIndex(); + control_model = control_model_combo->GetSelectedIndex(); } // +--------------------------------------------------------------------+ @@ -350,32 +350,32 @@ CtlDlg::OnControlModel(AWEvent* event) void CtlDlg::OnJoySelect(AWEvent* event) { - joy_select = joy_select_combo->GetSelectedIndex(); + joy_select = joy_select_combo->GetSelectedIndex(); } void CtlDlg::OnJoyThrottle(AWEvent* event) { - joy_throttle = joy_throttle_combo->GetSelectedIndex(); + joy_throttle = joy_throttle_combo->GetSelectedIndex(); } void CtlDlg::OnJoyRudder(AWEvent* event) { - joy_rudder = joy_rudder_combo->GetSelectedIndex(); + joy_rudder = joy_rudder_combo->GetSelectedIndex(); } void CtlDlg::OnJoySensitivity(AWEvent* event) { - joy_sensitivity = joy_sensitivity_slider->GetValue(); + joy_sensitivity = joy_sensitivity_slider->GetValue(); } void CtlDlg::OnJoyAxis(AWEvent* event) { - if (manager) - manager->ShowJoyDlg(); + if (manager) + manager->ShowJoyDlg(); } // +--------------------------------------------------------------------+ @@ -383,19 +383,19 @@ CtlDlg::OnJoyAxis(AWEvent* event) void CtlDlg::OnMouseSelect(AWEvent* event) { - mouse_select = mouse_select_combo->GetSelectedIndex(); + mouse_select = mouse_select_combo->GetSelectedIndex(); } void CtlDlg::OnMouseSensitivity(AWEvent* event) { - mouse_sensitivity = mouse_sensitivity_slider->GetValue(); + mouse_sensitivity = mouse_sensitivity_slider->GetValue(); } void CtlDlg::OnMouseInvert(AWEvent* event) { - mouse_invert = mouse_invert_checkbox->GetButtonState() > 0; + mouse_invert = mouse_invert_checkbox->GetButtonState() > 0; } // +--------------------------------------------------------------------+ @@ -411,15 +411,15 @@ void CtlDlg::OnMod(AWEvent* event) { manager->ShowModDlg(); } void CtlDlg::OnApply(AWEvent* event) { - if (manager) - manager->ApplyOptions(); + if (manager) + manager->ApplyOptions(); } void CtlDlg::OnCancel(AWEvent* event) { - if (manager) - manager->CancelOptions(); + if (manager) + manager->CancelOptions(); } // +--------------------------------------------------------------------+ @@ -427,35 +427,35 @@ CtlDlg::OnCancel(AWEvent* event) void CtlDlg::Apply() { - if (closed) return; + if (closed) return; - Starshatter* stars = Starshatter::GetInstance(); + Starshatter* stars = Starshatter::GetInstance(); - if (stars) { - KeyMap& keymap = stars->GetKeyMap(); + if (stars) { + KeyMap& keymap = stars->GetKeyMap(); - keymap.Bind(KEY_CONTROL_MODEL, control_model, 0); + keymap.Bind(KEY_CONTROL_MODEL, control_model, 0); - keymap.Bind(KEY_JOY_SELECT, joy_select, 0); - keymap.Bind(KEY_JOY_RUDDER, joy_rudder, 0); - keymap.Bind(KEY_JOY_THROTTLE, joy_throttle, 0); - keymap.Bind(KEY_JOY_SENSE, joy_sensitivity, 0); + keymap.Bind(KEY_JOY_SELECT, joy_select, 0); + keymap.Bind(KEY_JOY_RUDDER, joy_rudder, 0); + keymap.Bind(KEY_JOY_THROTTLE, joy_throttle, 0); + keymap.Bind(KEY_JOY_SENSE, joy_sensitivity, 0); - keymap.Bind(KEY_MOUSE_SELECT, mouse_select, 0); - keymap.Bind(KEY_MOUSE_SENSE, mouse_sensitivity, 0); - keymap.Bind(KEY_MOUSE_INVERT, mouse_invert, 0); + keymap.Bind(KEY_MOUSE_SELECT, mouse_select, 0); + keymap.Bind(KEY_MOUSE_SENSE, mouse_sensitivity, 0); + keymap.Bind(KEY_MOUSE_INVERT, mouse_invert, 0); - keymap.SaveKeyMap("key.cfg", 256); + keymap.SaveKeyMap("key.cfg", 256); - stars->MapKeys(); - Ship::SetControlModel(control_model); - } + stars->MapKeys(); + Ship::SetControlModel(control_model); + } - closed = true; + closed = true; } void CtlDlg::Cancel() { - closed = true; + closed = true; } -- cgit v1.1