Changeset 1794Tweet

Timestamp:

Aug 23, 2012, 2:32:02 PM (11 years ago)

Author:

touky

Message:

Input now works correctly

Location:

trunk

Files:

• src/input/input.cpp (modified) (3 diffs)
• test/BtPhysTest.cpp (modified) (1 diff)

trunk/src/input/input.cpp

@@ -238 +238 @@
 int InputTracker::GetStatus(Key Button)
 {
-        for (int i = 0; i < m_input_assocation_list.Count(); i++)
-        {
-                ButtonSetting &CurIT = m_input_assocation_list[i];
-
-                if (Button == CurIT.m_raw_button)
-                        return GetCurrentButtonStatus(CurIT.m_raw_button);
-        }
-        return 0;
+        return GetCurrentButtonStatus(Button);
 }
 
@@ -251 +244 @@
 bool InputTracker::WasReleased(Key Button)
 {
-        for (int i = 0; i < m_input_assocation_list.Count(); i++)
-        {
-                ButtonSetting &CurIT = m_input_assocation_list[i];
-                
-                if (Button == CurIT.m_raw_button)
-                {
-                        if (GetPreviousButtonStatus(CurIT.m_raw_button) &&
-                                !GetCurrentButtonStatus(CurIT.m_raw_button))
-                                return true;
-                        return false;
-                }
-        }
+        if (GetPreviousButtonStatus(Button) &&
+                !GetCurrentButtonStatus(Button))
+                return true;
         return false;
 }
@@ -269 +253 @@
 bool InputTracker::WasPressed(Key Button)
 {
-        for (int i = 0; i < m_input_assocation_list.Count(); i++)
-        {
-                ButtonSetting &CurIT = m_input_assocation_list[i];
-
-                if (Button == CurIT.m_raw_button)
-                {
-                        if (!GetPreviousButtonStatus(CurIT.m_raw_button) &&
-                                GetCurrentButtonStatus(CurIT.m_raw_button))
-                                return true;
-                        return false;
-                }
-        }
+        if (!GetPreviousButtonStatus(Button) &&
+                GetCurrentButtonStatus(Button))
+                return true;
         return false;
 }

trunk/test/BtPhysTest.cpp

@@ -229 +229 @@
     WorldEntity::TickGame(seconds);
 
-    if (Input::GetButtonState(27 /*SDLK_ESCAPE*/))
+    if (Input::WasReleased(Key::K_ESCAPE))
         Ticker::Shutdown();