diff options
| author | Simon Howard | 2010-08-31 19:26:32 +0000 |
|---|---|---|
| committer | Simon Howard | 2010-08-31 19:26:32 +0000 |
| commit | 22fc405736dc4796958de221c07d52432f1b271b (patch) | |
| tree | c05962aa5e839566ea40dd9b1f4ba3581954af8a /src/m_controls.h | |
| parent | f391d85c96afa91a2302c58191ce8d401fdba2e2 (diff) | |
| parent | 64918568eee62c73cbb87aa1bd68e191f19a4af3 (diff) | |
| download | chocolate-doom-22fc405736dc4796958de221c07d52432f1b271b.tar.gz chocolate-doom-22fc405736dc4796958de221c07d52432f1b271b.tar.bz2 chocolate-doom-22fc405736dc4796958de221c07d52432f1b271b.zip | |
Merge from trunk.
Subversion-branch: /branches/raven-branch
Subversion-revision: 1987
Diffstat (limited to 'src/m_controls.h')
| -rw-r--r-- | src/m_controls.h | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/src/m_controls.h b/src/m_controls.h index 2a4aa3df..389c94a0 100644 --- a/src/m_controls.h +++ b/src/m_controls.h @@ -52,6 +52,9 @@ extern int key_useartifact; extern int key_message_refresh; extern int key_pause; +extern int key_multi_msg; +extern int key_multi_msgplayer[8]; + extern int key_weapon1; extern int key_weapon2; extern int key_weapon3; @@ -61,6 +64,11 @@ extern int key_weapon6; extern int key_weapon7; extern int key_weapon8; +extern int key_demo_quit; +extern int key_spy; +extern int key_prevweapon; +extern int key_nextweapon; + extern int key_map_north; extern int key_map_south; extern int key_map_east; @@ -125,6 +133,9 @@ extern int mousebstraferight; extern int mousebbackward; extern int mousebuse; +extern int mousebprevweapon; +extern int mousebnextweapon; + extern int joybfire; extern int joybstrafe; extern int joybuse; @@ -135,14 +146,18 @@ extern int joybjump; extern int joybstrafeleft; extern int joybstraferight; +extern int joybprevweapon; +extern int joybnextweapon; + extern int dclick_use; - + void M_BindBaseControls(void); void M_BindHereticControls(void); void M_BindHexenControls(void); void M_BindWeaponControls(void); void M_BindMapControls(void); void M_BindMenuControls(void); +void M_BindChatControls(unsigned int num_players); void M_ApplyPlatformDefaults(void); |