Fixes spacing for "for", "while", "switch" and "if"

Also moved && and || to ends of lines instead of start.
Fixed misc vertical alignments and some { needed newlining.
This commit is contained in:
Matthew Parlane
2014-03-11 00:30:55 +13:00
parent 4591464486
commit 31cfc73a09
189 changed files with 1250 additions and 1159 deletions

View File

@ -244,148 +244,148 @@ void TASInputDlg::ResetValues()
void TASInputDlg::GetKeyBoardInput(SPADStatus *PadStatus)
{
if(PadStatus->stickX != 128)
if (PadStatus->stickX != 128)
{
mainX = PadStatus->stickX;
mstickx = true;
wx_mainX_t->SetValue(wxString::Format(wxT("%i"), mainX));
}
else if(mstickx)
else if (mstickx)
{
mstickx = false;
mainX = 128;
wx_mainX_t->SetValue(wxString::Format(wxT("%i"), mainX));
}
if(PadStatus->stickY != 128)
if (PadStatus->stickY != 128)
{
mainY = PadStatus->stickY;
msticky = true;
wx_mainY_t->SetValue(wxString::Format(wxT("%i"),mainY));
}
else if(msticky)
else if (msticky)
{
msticky = false;
mainY = 128;
wx_mainY_t->SetValue(wxString::Format(wxT("%i"), mainY));
}
if(PadStatus->substickX != 128)
if (PadStatus->substickX != 128)
{
cX = PadStatus->substickX;
cstickx = true;
wx_cX_t->SetValue(wxString::Format(wxT("%i"), cX));
}
else if(cstickx)
else if (cstickx)
{
cstickx = false;
cX = 128;
wx_cX_t->SetValue(wxString::Format(wxT("%i"), cX));
}
if(PadStatus->substickY != 128)
if (PadStatus->substickY != 128)
{
cY = PadStatus->substickY;
csticky = true;
wx_cY_t->SetValue(wxString::Format(wxT("%i"), cY));
}
else if(csticky)
else if (csticky)
{
csticky = false;
cY = 128;
wx_cY_t->SetValue(wxString::Format(wxT("%i"), cY));
}
if(((PadStatus->button & PAD_BUTTON_UP) != 0))
if ((PadStatus->button & PAD_BUTTON_UP) != 0)
{
wx_up_button->SetValue(true);
DU_cont = true;
}
else if(DU_cont)
else if (DU_cont)
{
wx_up_button->SetValue(false);
DU_cont = false;
}
if(((PadStatus->button & PAD_BUTTON_DOWN) != 0))
if ((PadStatus->button & PAD_BUTTON_DOWN) != 0)
{
wx_down_button->SetValue(true);
DD_cont = true;
}
else if(DD_cont)
else if (DD_cont)
{
wx_down_button->SetValue(false);
DD_cont = false;
}
if(((PadStatus->button & PAD_BUTTON_LEFT) != 0))
if ((PadStatus->button & PAD_BUTTON_LEFT) != 0)
{
wx_left_button->SetValue(true);
DL_cont = true;
}
else if(DL_cont)
else if (DL_cont)
{
wx_left_button->SetValue(false);
DL_cont = false;
}
if(((PadStatus->button & PAD_BUTTON_RIGHT) != 0))
if ((PadStatus->button & PAD_BUTTON_RIGHT) != 0)
{
wx_right_button->SetValue(true);
DR_cont = true;
}
else if(DR_cont)
else if (DR_cont)
{
wx_right_button->SetValue(false);
DR_cont = false;
}
if(((PadStatus->button & PAD_BUTTON_A) != 0))
if ((PadStatus->button & PAD_BUTTON_A) != 0)
{
wx_a_button->SetValue(true);
A_cont = true;
}
else if(A_cont)
else if (A_cont)
{
wx_a_button->SetValue(false);
A_cont = false;
}
if(((PadStatus->button & PAD_BUTTON_B) != 0))
if ((PadStatus->button & PAD_BUTTON_B) != 0)
{
wx_b_button->SetValue(true);
B_cont = true;
}
else if(B_cont)
else if (B_cont)
{
wx_b_button->SetValue(false);
B_cont = false;
}
if(((PadStatus->button & PAD_BUTTON_X) != 0))
if ((PadStatus->button & PAD_BUTTON_X) != 0)
{
wx_x_button->SetValue(true);
X_cont = true;
}
else if(X_cont)
else if (X_cont)
{
wx_x_button->SetValue(false);
X_cont = false;
}
if(((PadStatus->button & PAD_BUTTON_Y) != 0))
if ((PadStatus->button & PAD_BUTTON_Y) != 0)
{
wx_y_button->SetValue(true);
Y_cont = true;
}
else if(Y_cont)
else if (Y_cont)
{
wx_y_button->SetValue(false);
Y_cont = false;
}
if(((PadStatus->triggerLeft) != 0))
if ((PadStatus->triggerLeft) != 0)
{
if (PadStatus->triggerLeft == 255)
{
@ -402,7 +402,7 @@ void TASInputDlg::GetKeyBoardInput(SPADStatus *PadStatus)
wx_l_t->SetValue(wxString::Format(wxT("%i"), PadStatus->triggerLeft));
L_cont = true;
}
else if(L_cont)
else if (L_cont)
{
wx_l_button->SetValue(false);
wx_l_s->SetValue(0);
@ -410,7 +410,7 @@ void TASInputDlg::GetKeyBoardInput(SPADStatus *PadStatus)
L_cont = false;
}
if(((PadStatus->triggerRight) != 0))
if ((PadStatus->triggerRight) != 0)
{
if (PadStatus->triggerRight == 255)
{
@ -427,7 +427,7 @@ void TASInputDlg::GetKeyBoardInput(SPADStatus *PadStatus)
wx_r_t->SetValue(wxString::Format(wxT("%i"), PadStatus->triggerRight));
R_cont = true;
}
else if(R_cont)
else if (R_cont)
{
wx_r_button->SetValue(false);
wx_r_s->SetValue(0);
@ -435,23 +435,23 @@ void TASInputDlg::GetKeyBoardInput(SPADStatus *PadStatus)
R_cont = false;
}
if(((PadStatus->button & PAD_TRIGGER_Z) != 0))
if ((PadStatus->button & PAD_TRIGGER_Z) != 0)
{
wx_z_button->SetValue(true);
Z_cont = true;
}
else if(Z_cont)
else if (Z_cont)
{
wx_z_button->SetValue(false);
Z_cont = false;
}
if(((PadStatus->button & PAD_BUTTON_START) != 0))
if ((PadStatus->button & PAD_BUTTON_START) != 0)
{
wx_start_button->SetValue(true);
START_cont = true;
}
else if(START_cont)
else if (START_cont)
{
wx_start_button->SetValue(false);
START_cont = false;
@ -487,27 +487,27 @@ void TASInputDlg::GetValues(SPADStatus *PadStatus, int controllerID)
PadStatus->triggerLeft = lTrig;
PadStatus->triggerRight = rTrig;
if(wx_up_button->IsChecked())
if (wx_up_button->IsChecked())
PadStatus->button |= PAD_BUTTON_UP;
else
PadStatus->button &= ~PAD_BUTTON_UP;
if(wx_down_button->IsChecked())
if (wx_down_button->IsChecked())
PadStatus->button |= PAD_BUTTON_DOWN;
else
PadStatus->button &= ~PAD_BUTTON_DOWN;
if(wx_left_button->IsChecked())
if (wx_left_button->IsChecked())
PadStatus->button |= PAD_BUTTON_LEFT;
else
PadStatus->button &= ~PAD_BUTTON_LEFT;
if(wx_right_button->IsChecked())
if (wx_right_button->IsChecked())
PadStatus->button |= PAD_BUTTON_RIGHT;
else
PadStatus->button &= ~PAD_BUTTON_RIGHT;
if(wx_a_button->IsChecked())
if (wx_a_button->IsChecked())
{
PadStatus->button |= PAD_BUTTON_A;
PadStatus->analogA = 0xFF;
@ -518,7 +518,7 @@ void TASInputDlg::GetValues(SPADStatus *PadStatus, int controllerID)
PadStatus->analogA = 0x00;
}
if(wx_b_button->IsChecked())
if (wx_b_button->IsChecked())
{
PadStatus->button |= PAD_BUTTON_B;
PadStatus->analogB = 0xFF;
@ -529,32 +529,32 @@ void TASInputDlg::GetValues(SPADStatus *PadStatus, int controllerID)
PadStatus->analogB = 0x00;
}
if(wx_x_button->IsChecked())
if (wx_x_button->IsChecked())
PadStatus->button |= PAD_BUTTON_X;
else
PadStatus->button &= ~PAD_BUTTON_X;
if(wx_y_button->IsChecked())
if (wx_y_button->IsChecked())
PadStatus->button |= PAD_BUTTON_Y;
else
PadStatus->button &= ~PAD_BUTTON_Y;
if(wx_z_button->IsChecked())
if (wx_z_button->IsChecked())
PadStatus->button |= PAD_TRIGGER_Z;
else
PadStatus->button &= ~PAD_TRIGGER_Z;
if(wx_start_button->IsChecked())
if (wx_start_button->IsChecked())
PadStatus->button |= PAD_BUTTON_START;
else
PadStatus->button &= ~PAD_BUTTON_START;
if(wx_r_button->IsChecked() || rTrig >= 255)
if (wx_r_button->IsChecked() || rTrig >= 255)
PadStatus->button |= PAD_TRIGGER_R;
else
PadStatus->button &= ~PAD_TRIGGER_R;
if(wx_l_button->IsChecked() || lTrig >= 255)
if (wx_l_button->IsChecked() || lTrig >= 255)
PadStatus->button |= PAD_TRIGGER_L;
else
PadStatus->button &= ~PAD_TRIGGER_L;
@ -568,7 +568,7 @@ void TASInputDlg::UpdateFromSliders(wxCommandEvent& event)
u8 *v;
update = 0;
switch(event.GetId())
switch (event.GetId())
{
case ID_MAIN_X_SLIDER:
text = wx_mainX_t;
@ -616,12 +616,12 @@ void TASInputDlg::UpdateFromSliders(wxCommandEvent& event)
*v = (u8) value;
text->SetValue(wxString::Format(wxT("%i"), value));
if(update == 1)
if (update == 1)
{
static_bitmap_main->SetBitmap(TASInputDlg::CreateStickBitmap(xaxis, yaxis));
}
if(update == 2)
if (update == 2)
{
static_bitmap_c->SetBitmap(TASInputDlg::CreateStickBitmap(c_xaxis, c_yaxis));
}
@ -634,7 +634,7 @@ void TASInputDlg::UpdateFromText(wxCommandEvent& event)
update = 0;
update_axis = 0;
switch(event.GetId())
switch (event.GetId())
{
case ID_MAIN_X_TEXT:
slider = wx_mainX_s;
@ -684,31 +684,28 @@ void TASInputDlg::UpdateFromText(wxCommandEvent& event)
*v = (u8) (value > 255 ? 255 : value);
slider->SetValue(*v);
if(update == 1)
if (update == 1)
{
if (update_axis == 1)
{
if(update_axis == 1)
{
xaxis = *v;
static_bitmap_main->SetBitmap(TASInputDlg::CreateStickBitmap(xaxis,yaxis));
}
if(update_axis == 2)
{
yaxis =256 - *v;
static_bitmap_main->SetBitmap(TASInputDlg::CreateStickBitmap(xaxis,yaxis));
}
xaxis = *v;
static_bitmap_main->SetBitmap(TASInputDlg::CreateStickBitmap(xaxis,yaxis));
}
else if (update_axis == 2)
{
yaxis =256 - *v;
static_bitmap_main->SetBitmap(TASInputDlg::CreateStickBitmap(xaxis,yaxis));
}
if(update == 2)
}
else if (update == 2)
{
if(update_axis == 1)
if (update_axis == 1)
{
c_xaxis = *v;
static_bitmap_c->SetBitmap(TASInputDlg::CreateStickBitmap(c_xaxis,c_yaxis));
}
if(update_axis == 2)
else if (update_axis == 2)
{
c_yaxis =256- *v;
static_bitmap_c->SetBitmap(TASInputDlg::CreateStickBitmap(c_xaxis,c_yaxis));
@ -731,13 +728,13 @@ void TASInputDlg::OnCloseWindow(wxCloseEvent& event)
bool TASInputDlg::TASHasFocus()
{
//allows numbers to be used as hotkeys
if(TextBoxHasFocus())
if (TextBoxHasFocus())
return false;
if (wxWindow::FindFocus() == this)
return true;
else if (wxWindow::FindFocus() != nullptr &&
wxWindow::FindFocus()->GetParent() == this)
wxWindow::FindFocus()->GetParent() == this)
return true;
else
return false;
@ -745,22 +742,22 @@ bool TASInputDlg::TASHasFocus()
bool TASInputDlg::TextBoxHasFocus()
{
if(wxWindow::FindFocus() == wx_mainX_t)
if (wxWindow::FindFocus() == wx_mainX_t)
return true;
if(wxWindow::FindFocus() == wx_mainY_t)
if (wxWindow::FindFocus() == wx_mainY_t)
return true;
if(wxWindow::FindFocus() == wx_cX_t)
if (wxWindow::FindFocus() == wx_cX_t)
return true;
if(wxWindow::FindFocus() == wx_cY_t)
if (wxWindow::FindFocus() == wx_cY_t)
return true;
if(wxWindow::FindFocus() == wx_l_t)
if (wxWindow::FindFocus() == wx_l_t)
return true;
if(wxWindow::FindFocus() == wx_r_t)
if (wxWindow::FindFocus() == wx_r_t)
return true;
return false;
@ -773,7 +770,7 @@ void TASInputDlg::OnMouseUpR(wxMouseEvent& event)
wxTextCtrl *textX, *textY;
int *x,*y;
switch(event.GetId())
switch (event.GetId())
{
case ID_MAIN_STICK:
sliderX = wx_mainX_s;
@ -823,7 +820,7 @@ void TASInputDlg::OnMouseDownL(wxMouseEvent& event)
wxTextCtrl *textX, *textY;
int *x,*y;
switch(event.GetId())
switch (event.GetId())
{
case ID_MAIN_STICK:
sliderX = wx_mainX_s;
@ -853,10 +850,10 @@ void TASInputDlg::OnMouseDownL(wxMouseEvent& event)
*x = ptM.x *2;
*y = ptM.y * 2;
if(*x > 255)
if (*x > 255)
*x = 255;
if(*y > 255)
if (*y > 255)
*y = 255;
sbitmap->SetBitmap(TASInputDlg::CreateStickBitmap(*x,*y));
@ -871,7 +868,7 @@ void TASInputDlg::OnMouseDownL(wxMouseEvent& event)
void TASInputDlg::SetTurboFalse(wxMouseEvent& event)
{
switch(event.GetId())
switch (event.GetId())
{
case ID_A:
A_turbo = false;
@ -932,12 +929,12 @@ void TASInputDlg::SetTurbo(wxMouseEvent& event)
{
wxCheckBox* placeholder;
switch(event.GetId())
switch (event.GetId())
{
case ID_A:
placeholder = wx_a_button;
if(A_turbo)
if (A_turbo)
A_turbo = false;
else
A_turbo = true;
@ -945,7 +942,7 @@ void TASInputDlg::SetTurbo(wxMouseEvent& event)
case ID_B:
placeholder = wx_b_button;
if(B_turbo)
if (B_turbo)
B_turbo = false;
else
B_turbo = true;
@ -953,7 +950,7 @@ void TASInputDlg::SetTurbo(wxMouseEvent& event)
case ID_X:
placeholder = wx_x_button;
if(X_turbo)
if (X_turbo)
X_turbo = false;
else
X_turbo = true;
@ -961,7 +958,7 @@ void TASInputDlg::SetTurbo(wxMouseEvent& event)
case ID_Y:
placeholder = wx_y_button;
if(Y_turbo)
if (Y_turbo)
Y_turbo = false;
else
Y_turbo = true;
@ -969,7 +966,7 @@ void TASInputDlg::SetTurbo(wxMouseEvent& event)
case ID_Z:
placeholder = wx_z_button;
if(Z_turbo)
if (Z_turbo)
Z_turbo = false;
else
Z_turbo = true;
@ -977,7 +974,7 @@ void TASInputDlg::SetTurbo(wxMouseEvent& event)
case ID_L:
placeholder = wx_l_button;
if(L_turbo)
if (L_turbo)
L_turbo = false;
else
L_turbo = true;
@ -985,7 +982,7 @@ void TASInputDlg::SetTurbo(wxMouseEvent& event)
case ID_R:
placeholder = wx_r_button;
if(R_turbo)
if (R_turbo)
R_turbo = false;
else
R_turbo = true;
@ -993,7 +990,7 @@ void TASInputDlg::SetTurbo(wxMouseEvent& event)
case ID_START:
placeholder = wx_start_button;
if(START_turbo)
if (START_turbo)
START_turbo = false;
else
START_turbo = true;
@ -1001,7 +998,7 @@ void TASInputDlg::SetTurbo(wxMouseEvent& event)
case ID_UP:
placeholder = wx_up_button;
if(DU_turbo)
if (DU_turbo)
DU_turbo = false;
else
DU_turbo = true;
@ -1009,7 +1006,7 @@ void TASInputDlg::SetTurbo(wxMouseEvent& event)
case ID_DOWN:
placeholder = wx_down_button;
if(DD_turbo)
if (DD_turbo)
DD_turbo = false;
else
DD_turbo = true;
@ -1017,7 +1014,7 @@ void TASInputDlg::SetTurbo(wxMouseEvent& event)
case ID_LEFT:
placeholder = wx_left_button;
if(DL_turbo)
if (DL_turbo)
DL_turbo = false;
else
DL_turbo = true;
@ -1025,7 +1022,7 @@ void TASInputDlg::SetTurbo(wxMouseEvent& event)
case ID_RIGHT:
placeholder = wx_right_button;
if(DR_turbo)
if (DR_turbo)
DR_turbo = false;
else
DR_turbo = true;
@ -1038,97 +1035,97 @@ void TASInputDlg::SetTurbo(wxMouseEvent& event)
void TASInputDlg::ButtonTurbo()
{
if(A_turbo)
if (A_turbo)
{
if(wx_a_button->GetValue())
if (wx_a_button->GetValue())
wx_a_button->SetValue(false);
else
wx_a_button->SetValue(true);
}
if(B_turbo)
if (B_turbo)
{
if(wx_b_button->GetValue())
if (wx_b_button->GetValue())
wx_b_button->SetValue(false);
else
wx_b_button->SetValue(true);
}
if(X_turbo)
if (X_turbo)
{
if(wx_x_button->GetValue())
if (wx_x_button->GetValue())
wx_x_button->SetValue(false);
else
wx_x_button->SetValue(true);
}
if(Y_turbo)
if (Y_turbo)
{
if(wx_y_button->GetValue())
if (wx_y_button->GetValue())
wx_y_button->SetValue(false);
else
wx_y_button->SetValue(true);
}
if(Z_turbo)
if (Z_turbo)
{
if(wx_z_button->GetValue())
if (wx_z_button->GetValue())
wx_z_button->SetValue(false);
else
wx_z_button->SetValue(true);
}
if(L_turbo)
if (L_turbo)
{
if(wx_l_button->GetValue())
if (wx_l_button->GetValue())
wx_l_button->SetValue(false);
else
wx_l_button->SetValue(true);
}
if(R_turbo)
if (R_turbo)
{
if(wx_r_button->GetValue())
if (wx_r_button->GetValue())
wx_r_button->SetValue(false);
else
wx_r_button->SetValue(true);
}
if(START_turbo)
if (START_turbo)
{
if(wx_start_button->GetValue())
if (wx_start_button->GetValue())
wx_start_button->SetValue(false);
else
wx_start_button->SetValue(true);
}
if(DU_turbo)
if (DU_turbo)
{
if(wx_up_button->GetValue())
if (wx_up_button->GetValue())
wx_up_button->SetValue(false);
else
wx_up_button->SetValue(true);
}
if(DD_turbo)
if (DD_turbo)
{
if(wx_down_button->GetValue())
if (wx_down_button->GetValue())
wx_down_button->SetValue(false);
else
wx_down_button->SetValue(true);
}
if(DL_turbo)
if (DL_turbo)
{
if(wx_left_button->GetValue())
if (wx_left_button->GetValue())
wx_left_button->SetValue(false);
else
wx_left_button->SetValue(true);
}
if(DR_turbo)
if (DR_turbo)
{
if(wx_right_button->GetValue())
if (wx_right_button->GetValue())
wx_right_button->SetValue(false);
else
wx_right_button->SetValue(true);