summaryrefslogtreecommitdiff
path: root/src/strife/p_user.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/strife/p_user.c')
-rw-r--r--src/strife/p_user.c25
1 files changed, 17 insertions, 8 deletions
diff --git a/src/strife/p_user.c b/src/strife/p_user.c
index 9e038a06..5a140190 100644
--- a/src/strife/p_user.c
+++ b/src/strife/p_user.c
@@ -166,18 +166,27 @@ void P_MovePlayer (player_t* player)
// if not onground.
onground = (player->mo->z <= player->mo->floorz);
- // villsa [STRIFE] jump button
- if (onground && cmd->buttons2 & BT2_JUMP)
+ // villsa [STRIFE] allows player to climb over things by jumping
+ if(!onground)
{
- if(!player->deltaviewheight)
- player->mo->momz += (8*FRACUNIT);
+ if(cmd->forwardmove)
+ P_Thrust (player, player->mo->angle, cmd->forwardmove);
}
+ else
+ {
+ // villsa [STRIFE] jump button
+ if (cmd->buttons2 & BT2_JUMP)
+ {
+ if(!player->deltaviewheight)
+ player->mo->momz += (8*FRACUNIT);
+ }
- if (cmd->forwardmove && onground)
- P_Thrust (player, player->mo->angle, cmd->forwardmove*2048);
+ if (cmd->forwardmove && onground)
+ P_Thrust (player, player->mo->angle, cmd->forwardmove*2048);
- if (cmd->sidemove && onground)
- P_Thrust (player, player->mo->angle-ANG90, cmd->sidemove*2048);
+ if (cmd->sidemove && onground)
+ P_Thrust (player, player->mo->angle-ANG90, cmd->sidemove*2048);
+ }
// villsa [STRIFE] TODO - verify
if ( (cmd->forwardmove || cmd->sidemove)