Fixing bad merge for user input joystick handling.

This commit is contained in:
Don Honerbrink 2015-08-03 10:14:04 -05:00
parent 1c4afedbc1
commit 8be7939803

View File

@ -79,8 +79,7 @@ bool UserInput::initialize()
for(int i = 0; i < SDL_NumJoysticks(); ++i)
{
joystick_ = SDL_JoystickOpen(i);
break;
joysticks_.push_back(SDL_JoystickOpen(i));
}