X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=ABM2%2FEngine%2FInputTask.cpp;h=016b419655195e25cddadfe0cad727c9d9953e0f;hb=c100d6f67b06abb348319e277a66b6b7ab0c4bd5;hp=5fd261d151838afb7fa26a202be31a679e9e0e68;hpb=6b7cd5e1f9f9d3bba924c61bb8567c996e10da41;p=matthijs%2FABM2.git

diff --git a/ABM2/Engine/InputTask.cpp b/ABM2/Engine/InputTask.cpp
index 5fd261d..016b419 100755
--- a/ABM2/Engine/InputTask.cpp
+++ b/ABM2/Engine/InputTask.cpp
@@ -11,7 +11,7 @@
 #pragma comment (lib, "dinput8.lib")
 #pragma comment (lib, "dxguid.lib")
 
-#endif WIN32
+#endif // WIN32
 
 //////////////////////////////////////////////////////////////////////
 // Construction/Destruction
@@ -27,9 +27,9 @@ int CInputTask::dY=0;
 unsigned int CInputTask::buttons=0;
 unsigned int CInputTask::oldButtons=0;
 
-#ifdef WIN32
-CInputTask::CInputTask()
+CInputTask::CInputTask(CKernel* kernel) : ITask(kernel)
 {
+#ifdef WIN32
 	din = NULL;
 	dinkeyboard = NULL;
 	memset(keys, 0, 256);
@@ -47,21 +47,26 @@ CInputTask::CInputTask()
 
 	// set the control you will have over the keyboard
 	dinkeyboard->SetCooperativeLevel(hWnd, DISCL_NONEXCLUSIVE | DISCL_FOREGROUND);
+#endif // WIN32
 }
 
 CInputTask::~CInputTask()
 {
+#ifdef WIN32
 	if (dinkeyboard != NULL) 
 	{
 		dinkeyboard->Unacquire();
 		dinkeyboard->Release();
 	}
 	if (din != NULL) din->Release();
+#endif // WIN32
 }
 
 bool CInputTask::Start()
 {
+#ifdef WIN32
 	dinkeyboard->Acquire();
+#endif // WIN32
 
 
 //	keys=SDL_GetKeyState(&keyCount);
@@ -73,10 +78,12 @@ bool CInputTask::Start()
 
 void CInputTask::Update()
 {
+#ifdef WIN32
 	dinkeyboard->Acquire();
 	memcpy(oldKeys, keys, 256*sizeof(BYTE));
 	dinkeyboard->GetDeviceState(256, (LPVOID)keys);
 
+#endif // WIN32
 //	SDL_PumpEvents();
 //	oldButtons=buttons;
 //	buttons=SDL_GetRelativeMouseState(&dX,&dY);
@@ -91,4 +98,3 @@ void CInputTask::Stop()
 	memset(keys, 0, 256);
 	memset(oldKeys, 0, 256);
 }
-#endif // WIN32