Fixed build errors in VS2013

The new joystick code resulted in two build errors in Visual Studio. Also fixed indentation (not really the main point, though).