Changeset 1343


Ignore:
Timestamp:
May 6, 2012, 4:11:19 AM (9 years ago)
Author:
sam
Message:

input: do not let the joystick override the keyboard.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/camera.cpp

    r1342 r1343  
    7272    if (stick && stick->GetAxisCount() >= 2)
    7373    {
    74         rightleft = 2.f * stick->GetAxis(0) * std::abs(stick->GetAxis(0));
    75         updown = -2.f * stick->GetAxis(1) * std::abs(stick->GetAxis(1));
     74        rightleft += 2.f * stick->GetAxis(0) * std::abs(stick->GetAxis(0));
     75        updown += -2.f * stick->GetAxis(1) * std::abs(stick->GetAxis(1));
    7676    }
    7777
Note: See TracChangeset for help on using the changeset viewer.