summaryrefslogtreecommitdiffstats
path: root/src/object/robotmain.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/object/robotmain.h')
-rw-r--r--src/object/robotmain.h17
1 files changed, 11 insertions, 6 deletions
diff --git a/src/object/robotmain.h b/src/object/robotmain.h
index 70fbc8d..cb0cd7f 100644
--- a/src/object/robotmain.h
+++ b/src/object/robotmain.h
@@ -14,10 +14,14 @@
// * You should have received a copy of the GNU General Public License
// * along with this program. If not, see http://www.gnu.org/licenses/.
-// robotmain.h
+/**
+ * \file object/robotmain.h
+ * \brief CRobotMain - main class of Colobot game engine
+ */
#pragma once
+
#include "common/global.h"
#include "common/singleton.h"
@@ -148,12 +152,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) {}
};
/**
@@ -383,6 +387,7 @@ protected:
void StopDisplayVisit();
void ExecuteCmd(char *cmd);
bool TestGadgetQuantity(int rank);
+ void UpdateSpeedLabel();
protected:
CInstanceManager* m_iMan;