- added Firebrand's patch to rename 'swap' due to naming conflicts in newer MSVC compilers.

SVN r2449 (trunk)
This commit is contained in:
Christoph Oelckers 2010-07-23 21:19:59 +00:00
commit 545a892faa
28 changed files with 50 additions and 50 deletions

View file

@ -629,7 +629,7 @@ bool FDInputJoystick::ReorderAxisPair(const GUID &xid, const GUID &yid, int pos)
}
if (x == pos + 1 && y == pos)
{ // Xbox 360 Controllers return them in this order.
swap(Axes[pos], Axes[pos + 1]);
swapvalues(Axes[pos], Axes[pos + 1]);
}
else if (x != pos || y != pos + 1)
{