OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- Fixed some improper preprocessor lines in autostart/autozend.cpp.

Browse source 
- Added XInput support. For the benefit of people compiling with MinGW,
  the CMakeLists.txt checks for xinput.h and disables it if it cannot
  be found. (And much to my surprise, I accidentally discovered that if you
  have the DirectX SDK installed, those headers actually do work with GCC,
  though they add a few extra warnings.)


SVN r1686 (trunk)
This commit is contained in:
Randy Heit 2009-06-28 03:09:17 +00:00
commit 49b95be4b2
11 changed files with 151 additions and 64 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/m_options.cpp
View file

@ -1700,6 +1700,7 @@ void M_OptDrawer ()
if (item->type != screenres)
{
FString somestring;
const char *label;
if (item->type != discrete_joy)
{
@ -1713,7 +1714,8 @@ void M_OptDrawer ()
}
else
{
label = (*item->e.joyvalues)[item->a.joyselection]->GetName();
somestring = (*item->e.joyvalues)[item->a.joyselection]->GetName();
label = somestring;
}
}
width = SmallFont->StringWidth(label);