[Orxonox-commit 1644] r6362 - code/branches/presentation2/data/gui/scripts

[scheusso at orxonox.net]

Author: scheusso
Date: 2009-12-16 12:35:48 +0100 (Wed, 16 Dec 2009)
New Revision: 6362

Modified:
   code/branches/presentation2/data/gui/scripts/KeyBindMenu.lua
Log:
joystick names are pretty now


Modified: code/branches/presentation2/data/gui/scripts/KeyBindMenu.lua
===================================================================
--- code/branches/presentation2/data/gui/scripts/KeyBindMenu.lua	2009-12-16 10:28:11 UTC (rev 6361)
+++ code/branches/presentation2/data/gui/scripts/KeyBindMenu.lua	2009-12-16 11:35:48 UTC (rev 6362)
@@ -108,8 +108,12 @@
         return "Key " .. string.sub(name, string.find(name, 'Key(.*)')+3)
     elseif( group == "MouseButtons") then
         return "Mouse " .. name
+    elseif( string.find(group, "JoyStickButtons") ~= nil ) then
+        return "Joystick " .. name
+    elseif( string.find(group, "JoyStickAxes") ~= nil ) then
+        return "Joystick Axis" .. string.sub(name, 5, 6) .. string.sub(name, string.find(name, 'Axis%d%d(.*)')+6)
     elseif( group == "MouseAxes" ) then
-        return "Mouse " .. string.sub(name, string.find(name, '.(.*)')+1) .. " " .. string.sub(name, 1, 1) .. "-Axes"
+        return "Mouse " .. string.sub(name, string.find(name, '.(.*)')+1) .. " " .. string.sub(name, 1, 1) .. "-Axis"
     end
     return key
 end