Reorganize key mappings

1 files changed, 2 insertions, 14 deletions

diff --git a/src/GameInitDispose.cpp b/src/GameInitDispose.cpp
index c4e1518..57dca01 100644
--- a/src/GameInitDispose.cpp
+++ b/src/GameInitDispose.cpp
@@ -54,13 +54,7 @@ extern float precipitationvert;
 extern float precipitationdensity;
 extern float soundscalefactor;
 extern int slomo;
-extern int forwardskey;
-extern int backwardskey;
-extern int leftkey;
-extern int rightkey;
-extern int aimkey;
-extern int psychicaimkey;
-extern int psychickey;
+extern struct Key keymap;
 
 void resizeWindow(Game* game, int width, int height)
 {
@@ -80,13 +74,7 @@ Game* makeGame(Config config, Scores scores)
 	game->musictoggle = config.music;
 
 	game->mouse_sensitivity = config.mouse_sensitivity;
-	forwardskey = config.key.forwards;
-	backwardskey = config.key.backwards;
-	leftkey = config.key.left;
-	rightkey = config.key.right;
-	aimkey = config.key.aim;
-	psychicaimkey = config.key.psychic_aim;
-	psychickey = config.key.psychic;
+	keymap = config.key;
 
 	game->levels = config.levels.ptr;
 	game->nummissions = config.levels.len;