--- a/LightClone/Source/InputManager.cpp	Thu Sep 22 10:38:54 2011 -0700
+++ b/LightClone/Source/InputManager.cpp	Thu Sep 22 10:47:05 2011 -0700
@@ -3,7 +3,6 @@
  */
 
 #include "InputManager.h"
-#include "EventSystem.h"
 
 /*
  * fMouseSensitivity
@@ -114,7 +113,7 @@
 /*
  * Update
  */
-void InputManager::Update(EventSystem* pEventSystem, float fElapsed)
+void InputManager::Update(float fElapsed)
 {
 	if(pKeyboard)
 	{
@@ -129,35 +128,6 @@
 				hResult = pKeyboard->GetDeviceState(sizeof(kCurrentKeyboardState), kCurrentKeyboardState);
 			}
 		}
-
-		for(uint32 i = 0; i < sizeof(kCurrentKeyboardState) / sizeof(kCurrentKeyboardState[0]); ++i)
-		{
-			// check for key up events
-			if(kPreviousKeyboardState[i] & 0x80)
-			{
-				if(!(kCurrentKeyboardState[i] & 0x80))
-				{
-					InputEvent kEvent;
-					kEvent.nType		= InputEventType_KeyUp;
-					kEvent.nKey			= i;
-					kEvent.nDuration	= 0;
-
-					pEventSystem->Post(kEvent);
-				}
-			}
-			else
-			{
-				if(kCurrentKeyboardState[i] & 0x80)
-				{
-					InputEvent kEvent;
-					kEvent.nType		= InputEventType_KeyDown;
-					kEvent.nKey			= i;
-					kEvent.nDuration	= 0;
-
-					pEventSystem->Post(kEvent);
-				}
-			}
-		}
 	}
 
 	if(pMouse)
@@ -176,44 +146,6 @@
 
 		fMouseX = Clamp(fMouseX + fMouseSensitivity * kCurrentMouseState.lX, kMouseBounds.X, kMouseBounds.X + kMouseBounds.Width - 1.0f);
 		fMouseY = Clamp(fMouseY + fMouseSensitivity * kCurrentMouseState.lY, kMouseBounds.Y, kMouseBounds.Y + kMouseBounds.Height - 1.0f);
-
-		for(uint32 i = 0; i < sizeof(kCurrentMouseState.rgbButtons) / sizeof(kCurrentMouseState.rgbButtons[0]); ++i)
-		{
-			if(kPreviousMouseState.rgbButtons[i] & 0x80)
-			{
-				if(!(kCurrentMouseState.rgbButtons[i] & 0x80))
-				{
-					InputEvent kEvent;
-					kEvent.nType		= InputEventType_MouseUp;
-					kEvent.nButton		= i;
-					kEvent.nDuration	= 0;
-
-					pEventSystem->Post(kEvent);
-				}
-			}
-			else
-			{
-				if(kCurrentMouseState.rgbButtons[i] & 0x80)
-				{
-					InputEvent kEvent;
-					kEvent.nType		= InputEventType_MouseDown;
-					kEvent.nButton		= i;
-					kEvent.nDuration	= 0;
-
-					pEventSystem->Post(kEvent);
-				}
-			}
-		}
-
-		if(kCurrentMouseState.lX != 0 || kCurrentMouseState.lY != 0)
-		{
-			InputEvent kEvent;
-			kEvent.nType		= InputEventType_MouseMove;
-			kEvent.fX			= fMouseX;
-			kEvent.fY			= fMouseY;
-
-			pEventSystem->Post(kEvent);
-		}
 	}
 }