commit bc304548e3e9b7c59e3cc22b383e106507ec701b
Author: Fabian Greffrath <fabian@greffrath.com>
AuthorDate: Tue Apr 6 15:03:28 2021 +0200
Commit: Fabian Greffrath <fabian@greffrath.com>
CommitDate: Tue Apr 6 15:03:28 2021 +0200
let "turn" mouse bindings act as aliases for the respective key bindings
---
src/doom/g_game.c | 16 ++++------------
src/heretic/g_game.c | 16 ++++------------
src/hexen/g_game.c | 20 ++++----------------
src/strife/g_game.c | 16 ++++------------
4 files changed, 16 insertions(+), 52 deletions(-)
diff --git a/src/doom/g_game.c b/src/doom/g_game.c
index f91db155..8159497f 100644
--- a/src/doom/g_game.c
+++ b/src/doom/g_game.c
@@ -369,12 +369,12 @@ void G_BuildTiccmd (ticcmd_t* cmd, int maketic)
// let movement keys cancel each other out
if (strafe)
{
- if (gamekeydown[key_right])
+ if (gamekeydown[key_right] || mousebuttons[mousebturnright])
{
// fprintf(stderr, "strafe right\n");
side += sidemove[speed];
}
- if (gamekeydown[key_left])
+ if (gamekeydown[key_left] || mousebuttons[mousebturnleft])
{
// fprintf(stderr, "strafe left\n");
side -= sidemove[speed];
@@ -383,26 +383,18 @@ void G_BuildTiccmd (ticcmd_t* cmd, int maketic)
side += sidemove[speed];
if (joyxmove < 0)
side -= sidemove[speed];
- if (mousebuttons[mousebturnright])
- side += sidemove[speed];
- if (mousebuttons[mousebturnleft])
- side -= sidemove[speed];
}
else
{
- if (gamekeydown[key_right])
+ if (gamekeydown[key_right] || mousebuttons[mousebturnright])
cmd->angleturn -= angleturn[tspeed];
- if (gamekeydown[key_left])
+ if (gamekeydown[key_left] || mousebuttons[mousebturnleft])
cmd->angleturn += angleturn[tspeed];
if (joyxmove > 0)
cmd->angleturn -= angleturn[tspeed];
if (joyxmove < 0)
cmd->angleturn += angleturn[tspeed];
- if (mousebuttons[mousebturnright])
- cmd->angleturn -= angleturn[tspeed];
- if (mousebuttons[mousebturnleft])
- cmd->angleturn += angleturn[tspeed];
}
if (gamekeydown[key_up])
diff --git a/src/heretic/g_game.c b/src/heretic/g_game.c
index b0268875..39ee2bc2 100644
--- a/src/heretic/g_game.c
+++ b/src/heretic/g_game.c
@@ -352,33 +352,25 @@ void G_BuildTiccmd(ticcmd_t *cmd, int maketic)
//
if (strafe)
{
- if (gamekeydown[key_right])
+ if (gamekeydown[key_right] || mousebuttons[mousebturnright])
side += sidemove[speed];
- if (gamekeydown[key_left])
+ if (gamekeydown[key_left] || mousebuttons[mousebturnleft])
side -= sidemove[speed];
if (joyxmove > 0)
side += sidemove[speed];
if (joyxmove < 0)
side -= sidemove[speed];
- if (mousebuttons[mousebturnright])
- side += sidemove[speed];
- if (mousebuttons[mousebturnleft])
- side -= sidemove[speed];
}
else
{
- if (gamekeydown[key_right])
+ if (gamekeydown[key_right] || mousebuttons[mousebturnright])
cmd->angleturn -= angleturn[tspeed];
- if (gamekeydown[key_left])
+ if (gamekeydown[key_left] || mousebuttons[mousebturnleft])
cmd->angleturn += angleturn[tspeed];
if (joyxmove > 0)
cmd->angleturn -= angleturn[tspeed];
if (joyxmove < 0)
cmd->angleturn += angleturn[tspeed];
- if (mousebuttons[mousebturnright])
- cmd->angleturn -= angleturn[tspeed];
- if (mousebuttons[mousebturnleft])
- cmd->angleturn += angleturn[tspeed];
}
if (gamekeydown[key_up])
diff --git a/src/hexen/g_game.c b/src/hexen/g_game.c
index df13651a..b5bb518c 100644
--- a/src/hexen/g_game.c
+++ b/src/hexen/g_game.c
@@ -270,11 +270,11 @@ void G_BuildTiccmd(ticcmd_t *cmd, int maketic)
//
if (strafe)
{
- if (gamekeydown[key_right])
+ if (gamekeydown[key_right] || mousebuttons[mousebturnright])
{
side += sidemove[pClass][speed];
}
- if (gamekeydown[key_left])
+ if (gamekeydown[key_left] || mousebuttons[mousebturnleft])
{
side -= sidemove[pClass][speed];
}
@@ -286,29 +286,17 @@ void G_BuildTiccmd(ticcmd_t *cmd, int maketic)
{
side -= sidemove[pClass][speed];
}
- if (mousebuttons[mousebturnright])
- {
- side += sidemove[pClass][speed];
- }
- if (mousebuttons[mousebturnleft])
- {
- side -= sidemove[pClass][speed];
- }
}
else
{
- if (gamekeydown[key_right])
+ if (gamekeydown[key_right] || mousebuttons[mousebturnright])
cmd->angleturn -= angleturn[tspeed];
- if (gamekeydown[key_left])
+ if (gamekeydown[key_left] || mousebuttons[mousebturnleft])
cmd->angleturn += angleturn[tspeed];
if (joyxmove > 0)
cmd->angleturn -= angleturn[tspeed];
if (joyxmove < 0)
cmd->angleturn += angleturn[tspeed];
- if (mousebuttons[mousebturnright])
- cmd->angleturn -= angleturn[tspeed];
- if (mousebuttons[mousebturnleft])
- cmd->angleturn += angleturn[tspeed];
}
if (gamekeydown[key_up])
diff --git a/src/strife/g_game.c b/src/strife/g_game.c
index 80b4a9c1..c834412c 100644
--- a/src/strife/g_game.c
+++ b/src/strife/g_game.c
@@ -420,12 +420,12 @@ void G_BuildTiccmd (ticcmd_t* cmd, int maketic)
// let movement keys cancel each other out
if (strafe)
{
- if (gamekeydown[key_right])
+ if (gamekeydown[key_right] || mousebuttons[mousebturnright])
{
// fprintf(stderr, "strafe right\n");
side += sidemove[speed];
}
- if (gamekeydown[key_left])
+ if (gamekeydown[key_left] || mousebuttons[mousebturnleft])
{
// fprintf(stderr, "strafe left\n");
side -= sidemove[speed];
@@ -434,26 +434,18 @@ void G_BuildTiccmd (ticcmd_t* cmd, int maketic)
side += sidemove[speed];
if (joyxmove < 0)
side -= sidemove[speed];
- if (mousebuttons[mousebturnright])
- side += sidemove[speed];
- if (mousebuttons[mousebturnleft])
- side -= sidemove[speed];
}
else
{
- if (gamekeydown[key_right])
+ if (gamekeydown[key_right] || mousebuttons[mousebturnright])
cmd->angleturn -= angleturn[tspeed];
- if (gamekeydown[key_left])
+ if (gamekeydown[key_left] || mousebuttons[mousebturnleft])
cmd->angleturn += angleturn[tspeed];
if (joyxmove > 0)
cmd->angleturn -= angleturn[tspeed];
if (joyxmove < 0)
cmd->angleturn += angleturn[tspeed];
- if (mousebuttons[mousebturnright])
- cmd->angleturn -= angleturn[tspeed];
- if (mousebuttons[mousebturnleft])
- cmd->angleturn += angleturn[tspeed];
}
if (gamekeydown[key_up])