summaryrefslogtreecommitdiffstats
path: root/src/object/robotmain.h
diff options
context:
space:
mode:
authorPiotr Dziwinski <piotrdz@gmail.com>2012-10-07 00:46:46 +0200
committerPiotr Dziwinski <piotrdz@gmail.com>2012-10-07 00:46:46 +0200
commit97f44035f1b3ebd2681236c23f14c4d3ea7f09ac (patch)
tree6937ba54a2e43d5e42fcb1cb2950684b4ab3c3ac /src/object/robotmain.h
parent70dae8796e96b309d95f220dfb083ed81261ceb6 (diff)
downloadcolobot-97f44035f1b3ebd2681236c23f14c4d3ea7f09ac.tar.gz
colobot-97f44035f1b3ebd2681236c23f14c4d3ea7f09ac.tar.bz2
colobot-97f44035f1b3ebd2681236c23f14c4d3ea7f09ac.zip
Changing and saving input bindings
Diffstat (limited to 'src/object/robotmain.h')
-rw-r--r--src/object/robotmain.h10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/object/robotmain.h b/src/object/robotmain.h
index dddd6d4..e475c43 100644
--- a/src/object/robotmain.h
+++ b/src/object/robotmain.h
@@ -148,12 +148,12 @@ const int SATCOM_MAX = 6;
*/
struct InputBinding
{
- //! Keyboard binding code (can be regular or virtual)
- unsigned int key;
- //! Joystick binding code (virtual)
- unsigned int joy;
+ //! Primary and secondary bindings
+ //! Can be regular key, virtual key or virtual joystick button
+ unsigned int primary, secondary;
- InputBinding() : key(KEY_INVALID), joy(KEY_INVALID) {}
+ InputBinding(unsigned int p = KEY_INVALID, unsigned int s = KEY_INVALID)
+ : primary(p), secondary(s) {}
};
/**