Input bindings rewrite

- moved input bindings to CRobotMain
- added virtual keymod and joystick button key presses
- fixed putenv error; other minor fixes

1 files changed, 34 insertions, 34 deletions

diff --git a/src/ui/maindialog.cpp b/src/ui/maindialog.cpp
index a2fc733..a40cc27 100644
--- a/src/ui/maindialog.cpp
+++ b/src/ui/maindialog.cpp
@@ -5956,41 +5956,41 @@ void CMainDialog::ChangeSetupQuality(int quality)
 static int key_table[KEY_TOTAL] =
 {
 /* TODO: #if _SCHOOL & _TEEN
-    KEYRANK_LEFT,
-    KEYRANK_RIGHT,
-    KEYRANK_UP,
-    KEYRANK_DOWN,
-    KEYRANK_CAMERA,
-    KEYRANK_NEAR,
-    KEYRANK_AWAY,
-    KEYRANK_HELP,
-    KEYRANK_PROG,
-    KEYRANK_SPEED10,
-    KEYRANK_SPEED15,
-    KEYRANK_SPEED20,
-    KEYRANK_QUIT,
+    INPUT_SLOT_LEFT,
+    INPUT_SLOT_RIGHT,
+    INPUT_SLOT_UP,
+    INPUT_SLOT_DOWN,
+    INPUT_SLOT_CAMERA,
+    INPUT_SLOT_NEAR,
+    INPUT_SLOT_AWAY,
+    INPUT_SLOT_HELP,
+    INPUT_SLOT_PROG,
+    INPUT_SLOT_SPEED10,
+    INPUT_SLOT_SPEED15,
+    INPUT_SLOT_SPEED20,
+    INPUT_SLOT_QUIT,
 #else */
-    KEYRANK_LEFT,
-    KEYRANK_RIGHT,
-    KEYRANK_UP,
-    KEYRANK_DOWN,
-    KEYRANK_GUP,
-    KEYRANK_GDOWN,
-    KEYRANK_ACTION,
-    KEYRANK_CAMERA,
-    KEYRANK_VISIT,
-    KEYRANK_NEXT,
-    KEYRANK_HUMAN,
-    KEYRANK_DESEL,
-    KEYRANK_NEAR,
-    KEYRANK_AWAY,
-    KEYRANK_HELP,
-    KEYRANK_PROG,
-    KEYRANK_CBOT,
-    KEYRANK_SPEED10,
-    KEYRANK_SPEED15,
-    KEYRANK_SPEED20,
-    KEYRANK_QUIT,
+    INPUT_SLOT_LEFT,
+    INPUT_SLOT_RIGHT,
+    INPUT_SLOT_UP,
+    INPUT_SLOT_DOWN,
+    INPUT_SLOT_GUP,
+    INPUT_SLOT_GDOWN,
+    INPUT_SLOT_ACTION,
+    INPUT_SLOT_CAMERA,
+    INPUT_SLOT_VISIT,
+    INPUT_SLOT_NEXT,
+    INPUT_SLOT_HUMAN,
+    INPUT_SLOT_DESEL,
+    INPUT_SLOT_NEAR,
+    INPUT_SLOT_AWAY,
+    INPUT_SLOT_HELP,
+    INPUT_SLOT_PROG,
+    INPUT_SLOT_CBOT,
+    INPUT_SLOT_SPEED10,
+    INPUT_SLOT_SPEED15,
+    INPUT_SLOT_SPEED20,
+    INPUT_SLOT_QUIT,
 // #endif
 };