Changeset 1343Tweet

Timestamp:

May 6, 2012, 4:11:19 AM (11 years ago)

Author:

sam

Message:

input: do not let the joystick override the keyboard.

File:

• trunk/src/camera.cpp (modified) (1 diff)

trunk/src/camera.cpp

@@ -72 +72 @@
     if (stick && stick->GetAxisCount() >= 2)
     {
-        rightleft = 2.f * stick->GetAxis(0) * std::abs(stick->GetAxis(0));
-        updown = -2.f * stick->GetAxis(1) * std::abs(stick->GetAxis(1));
+        rightleft += 2.f * stick->GetAxis(0) * std::abs(stick->GetAxis(0));
+        updown += -2.f * stick->GetAxis(1) * std::abs(stick->GetAxis(1));
     }