summaryrefslogtreecommitdiff
path: root/src/heretic/g_game.c
diff options
context:
space:
mode:
authorSimon Howard2008-09-23 17:54:13 +0000
committerSimon Howard2008-09-23 17:54:13 +0000
commit350fe185784d6d0350ed8b675630440ff425a6ca (patch)
tree2d5f3415d193bd72e72a0b0a435a6204f6be8477 /src/heretic/g_game.c
parent69b0c4526e6f2d6fe6920f1efa3b32e27b3db0bc (diff)
downloadchocolate-doom-350fe185784d6d0350ed8b675630440ff425a6ca.tar.gz
chocolate-doom-350fe185784d6d0350ed8b675630440ff425a6ca.tar.bz2
chocolate-doom-350fe185784d6d0350ed8b675630440ff425a6ca.zip
Add heretic key controls to config file list. Add key binding code to
heretic/d_main.c and change g_game.c to use the common definitions. Subversion-branch: /branches/raven-branch Subversion-revision: 1265
Diffstat (limited to 'src/heretic/g_game.c')
-rw-r--r--src/heretic/g_game.c16
1 files changed, 1 insertions, 15 deletions
diff --git a/src/heretic/g_game.c b/src/heretic/g_game.c
index 59be2f87..83279a2e 100644
--- a/src/heretic/g_game.c
+++ b/src/heretic/g_game.c
@@ -29,6 +29,7 @@
#include "doomkeys.h"
#include "i_timer.h"
#include "i_system.h"
+#include "m_controls.h"
#include "m_misc.h"
#include "m_random.h"
#include "p_local.h"
@@ -134,21 +135,6 @@ byte *savebuffer, *save_p;
//
// controls (have defaults)
//
-int key_right, key_left, key_up, key_down;
-int key_strafeleft, key_straferight;
-int key_fire, key_use, key_strafe, key_speed;
-int key_flyup, key_flydown, key_flycenter;
-int key_lookup, key_lookdown, key_lookcenter;
-int key_invleft, key_invright, key_useartifact;
-
-int mousebfire;
-int mousebstrafe;
-int mousebforward;
-
-int joybfire;
-int joybstrafe;
-int joybuse;
-int joybspeed;