Changeset 2908 for code/branches/questsystem5/src/core/input/ExtendedInputState.cc

Timestamp:

Apr 8, 2009, 12:58:47 AM (16 years ago)

Author:

dafrick

Message:

Reverted to revision 2906 (because I'm too stupid to merge correctly, 2nd try will follow shortly. )

Location:

code/branches/questsystem5

Files:

• . (modified) (1 prop)
• src/core/input/ExtendedInputState.cc (modified) (2 diffs)

code/branches/questsystem5/src/core/input/ExtendedInputState.cc

@@ -402 +402 @@
     }
 
-    void ExtendedInputState::updateInput(float dt)
+    void ExtendedInputState::tickInput(float dt)
     {
         for (unsigned int i = 0; i < allHandlers_.size(); ++i)
         {
-            allHandlers_[i]->updateInput(dt);
-        }
-    }
-
-    void ExtendedInputState::updateInput(float dt, unsigned int device)
+            allHandlers_[i]->tickInput(dt);
+        }
+    }
+
+    void ExtendedInputState::tickInput(float dt, unsigned int device)
     {
         switch (device)
@@ -416 +416 @@
         case Keyboard:
             for (unsigned int i = 0; i < keyHandlers_.size(); ++i)
-                keyHandlers_[i]->updateKey(dt);
+                keyHandlers_[i]->tickKey(dt);
             break;
 
         case Mouse:
             for (unsigned int i = 0; i < mouseHandlers_.size(); ++i)
-                mouseHandlers_[i]->updateMouse(dt);
+                mouseHandlers_[i]->tickMouse(dt);
             break;
 
         default: // joy sticks
             for (unsigned int i = 0; i < joyStickHandlers_[device - 2].size(); ++i)
-                joyStickHandlers_[device - 2][i]->updateJoyStick(dt, device - 2);
+                joyStickHandlers_[device - 2][i]->tickJoyStick(dt, device - 2);
             break;
         }