Merge pull request #19 from Hasufel/master

2014-02-10 11:40:31 -08:00
parent 344cda94d2
commit 14ab05b950
5 changed files with 90 additions and 19 deletions
--- a/project/include/Display.h
+++ b/project/include/Display.h
@@ -58,11 +58,13 @@ enum EventType
   etJoyHatMove, // 26
   etJoyButtonDown, // 27
   etJoyButtonUp, // 28
+   etJoyDeviceAdded, //29
+   etJoyDeviceRemoved, //30
   
-   etSysWM, // 29
+   etSysWM, // 31
   
-   etRenderContextLost, // 30
-   etRenderContextRestored, // 31
+   etRenderContextLost, // 32
+   etRenderContextRestored, // 33
 };

 enum EventFlags