Project::OSiRiON - Git repositories
Project::OSiRiON
News . About . Screenshots . Downloads . Forum . Wiki . Tracker . Git
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStijn Buys <ingar@osirion.org>2016-07-31 14:14:25 +0200
committerStijn Buys <ingar@osirion.org>2016-07-31 14:14:25 +0200
commit6817dec0b405b325a2762e352ad2a5916c24542a (patch)
treea61a1b756c4ffa18c2a8c9ce874a9ae4cdf591e0 /src/client/key.cc
parentb9205ba21a5663d1aa57b1b1213bea5ecbf1c073 (diff)
Added reset_controls function to revert to the default keyboard configuration,
don't override unbound keys with default binds.
Diffstat (limited to 'src/client/key.cc')
-rw-r--r--src/client/key.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/client/key.cc b/src/client/key.cc
index 36c9787..e2e56e5 100644
--- a/src/client/key.cc
+++ b/src/client/key.cc
@@ -6,7 +6,7 @@
#include "auxiliary/functions.h"
#include "client/key.h"
-
+#include <cassert>
namespace client
{
@@ -18,6 +18,7 @@ Key::Key(const unsigned int scancode, const char *name, const char ascii)
key_lastpressed = 0;
key_waspressed = 0;
+ assert(name);
key_name.assign(name);
clear();