Merge pull request #39 from bendmorris/gamepad

Adding function to detect joystick names on Win/Mac/Linux.
2014-03-14 11:10:42 -07:00
parent 587edb4e5d 94a0ba8f2f
commit 093760350e
4 changed files with 24 additions and 0 deletions
--- a/project/include/Display.h
+++ b/project/include/Display.h
@@ -447,6 +447,8 @@ public:
   
   virtual uint32 getBackgroundMask() { return 0xffffffff; }

+   virtual const char *getJoystickName(int id) { return NULL; }
+
   Matrix GetFullMatrix(bool inStageScaling);
   bool FinishEditOnEnter();