From d1c8cb2cfed18f5c5c32347011f33a210c96ff38 Mon Sep 17 00:00:00 2001
From: Samuel Villareal
Date: Fri, 3 Sep 2010 04:11:39 +0000
Subject: + 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
---
 src/strife/p_user.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'src/strife/p_user.c')

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 ||
-- 
cgit v1.2.3