summaryrefslogtreecommitdiff
path: root/src/strife/p_user.c
diff options
context:
space:
mode:
authorSamuel Villareal2010-09-03 04:11:39 +0000
committerSamuel Villareal2010-09-03 04:11:39 +0000
commitd1c8cb2cfed18f5c5c32347011f33a210c96ff38 (patch)
tree2d0e2e886d0dae84347e8d9a390ea77652bab403 /src/strife/p_user.c
parent1c756bd681af926fabdb99c57248e68b776e66fd (diff)
downloadchocolate-doom-d1c8cb2cfed18f5c5c32347011f33a210c96ff38.tar.gz
chocolate-doom-d1c8cb2cfed18f5c5c32347011f33a210c96ff38.tar.bz2
chocolate-doom-d1c8cb2cfed18f5c5c32347011f33a210c96ff38.zip
+ More button flags added to buttoncode_e
+ Looking/jumping implemented + Jump/look/center keys supported + Strife mouse firing bug implemented Subversion-branch: /branches/strife-branch Subversion-revision: 2003
Diffstat (limited to 'src/strife/p_user.c')
-rw-r--r--src/strife/p_user.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/strife/p_user.c b/src/strife/p_user.c
index 3c0cdb5e..9e038a06 100644
--- a/src/strife/p_user.c
+++ b/src/strife/p_user.c
@@ -167,7 +167,7 @@ void P_MovePlayer (player_t* player)
onground = (player->mo->z <= player->mo->floorz);
// villsa [STRIFE] jump button
- if (onground && cmd->buttons2 & BT_JUMP)
+ if (onground && cmd->buttons2 & BT2_JUMP)
{
if(!player->deltaviewheight)
player->mo->momz += (8*FRACUNIT);
@@ -187,7 +187,7 @@ void P_MovePlayer (player_t* player)
}
// villsa [STRIFE] centerview button
- if (cmd->buttons2 & BT_CENTERVIEW)
+ if (cmd->buttons2 & BT2_CENTERVIEW)
player->centerview = 1;
// villsa [STRIFE] adjust player's pitch when centerviewing
@@ -210,7 +210,7 @@ void P_MovePlayer (player_t* player)
}
// villsa [STRIFE] look up action
- if (cmd->buttons2 & BT_LOOKUP)
+ if (cmd->buttons2 & BT2_LOOKUP)
{
player->pitch += LOOKPITCHAMOUNT;
if ((player->pitch + LOOKPITCHAMOUNT) > LOOKUPMAX ||
@@ -220,7 +220,7 @@ void P_MovePlayer (player_t* player)
else
{
// villsa [STRIFE] look down action
- if (cmd->buttons2 & BT_LOOKDOWN)
+ if (cmd->buttons2 & BT2_LOOKDOWN)
{
player->pitch -= LOOKPITCHAMOUNT;
if ((player->pitch - LOOKPITCHAMOUNT) > LOOKUPMAX ||