summaryrefslogtreecommitdiff
path: root/setup/txt_keyinput.h
diff options
context:
space:
mode:
authorSimon Howard2011-04-11 19:49:45 +0000
committerSimon Howard2011-04-11 19:49:45 +0000
commiteb86fcdf3099404ed8cc0feaf96dd94654d2b8dd (patch)
tree26acfbe82ee8ce3281e8f254467e6f66af095159 /setup/txt_keyinput.h
parentd4ef7c37721ee261ac23305fd52239a91e58250a (diff)
downloadchocolate-doom-eb86fcdf3099404ed8cc0feaf96dd94654d2b8dd.tar.gz
chocolate-doom-eb86fcdf3099404ed8cc0feaf96dd94654d2b8dd.tar.bz2
chocolate-doom-eb86fcdf3099404ed8cc0feaf96dd94654d2b8dd.zip
Allow the shift key to be held down when changing key/mouse/joystick
bindings to prevent bindings to the same key from being cleared (thanks myk). Subversion-branch: /trunk/chocolate-doom Subversion-revision: 2325
Diffstat (limited to 'setup/txt_keyinput.h')
-rw-r--r--setup/txt_keyinput.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/setup/txt_keyinput.h b/setup/txt_keyinput.h
index 4952a970..5df0b2e3 100644
--- a/setup/txt_keyinput.h
+++ b/setup/txt_keyinput.h
@@ -35,6 +35,7 @@ struct txt_key_input_s
{
txt_widget_t widget;
int *variable;
+ int check_conflicts;
};
txt_key_input_t *TXT_NewKeyInput(int *variable);