OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- Backend update from Raze.

Browse source 
This is mainly code cleanup from setting the compiler to a stricter warning level.
This commit is contained in:
Christoph Oelckers 2021-12-29 10:25:31 +01:00
commit 1c517d19fa
102 changed files with 493 additions and 590 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/common/menu/joystickmenu.cpp
View file

@ -160,12 +160,12 @@ void UpdateJoystickMenu(IJoystickConfig *selected)
it = opt->GetItem("ConnectMessage2");
if (it != nullptr) it->SetValue(0, !use_joystick);
for (int i = 0; i < (int)Joysticks.Size(); ++i)
for (int ii = 0; ii < (int)Joysticks.Size(); ++ii)
{
it = CreateOptionMenuItemJoyConfigMenu(Joysticks[i]->GetName(), Joysticks[i]);
it = CreateOptionMenuItemJoyConfigMenu(Joysticks[ii]->GetName(), Joysticks[ii]);
GC::WriteBarrier(opt, it);
opt->mItems.Push(it);
if (i == itemnum) opt->mSelectedItem = opt->mItems.Size();
if (ii == itemnum) opt->mSelectedItem = opt->mItems.Size();
}
if (opt->mSelectedItem >= (int)opt->mItems.Size())
{
@ -179,15 +179,15 @@ void UpdateJoystickMenu(IJoystickConfig *selected)
auto p = CurrentMenu->PointerVar<IJoystickConfig>("mJoy");
if (p != nullptr)
{
unsigned i;
for (i = 0; i < Joysticks.Size(); ++i)
unsigned ii;
for (ii = 0; ii < Joysticks.Size(); ++ii)
{
if (Joysticks[i] == p)
if (Joysticks[ii] == p)
{
break;
}
}
if (i == Joysticks.Size())
if (ii == Joysticks.Size())
{
CurrentMenu->Close();
}