summaryrefslogtreecommitdiff
path: root/src/game/bg_pmove.c
diff options
context:
space:
mode:
authorTim Angus <tim@ngus.net>2001-01-15 04:06:42 +0000
committerTim Angus <tim@ngus.net>2001-01-15 04:06:42 +0000
commit64806bda9892ce84e0b5e11ce5e5f9052c1183b3 (patch)
treeb3e6b5c05c901b13031710c4d28cf21baae71b3b /src/game/bg_pmove.c
parentdfa6ae440ddddaaf22e4b32dbc6d31b13e162d4d (diff)
Half-done revamping defmenus; bug fixes;MCU
Diffstat (limited to 'src/game/bg_pmove.c')
-rw-r--r--src/game/bg_pmove.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/src/game/bg_pmove.c b/src/game/bg_pmove.c
index bffc47fc..6787e250 100644
--- a/src/game/bg_pmove.c
+++ b/src/game/bg_pmove.c
@@ -422,7 +422,7 @@ static float PM_CmdScale( usercmd_t *cmd ) {
aForward = abs( cmd->forwardmove );
aRight = abs( cmd->rightmove );
- if( ( aForward <= 64 && aForward > 5 ) && ( aRight <= 64 && aRight > 5 ) )
+ if( ( aForward <= 64 && aForward > 5 ) || ( aRight <= 64 && aRight > 5 ) )
{
//restore stamina
pm->ps->stats[ STAT_STAMINA ] += (dTime/5);
@@ -1550,6 +1550,9 @@ static void PM_GroundClimbTrace( void )
if( abc[ 2 ] == 0 )
correction = 0;
+ if( correction > 32768 )
+ correction -= 32768;
+
//phew! - correct the angle
pm->ps->delta_angles[ YAW ] -= correction;
}
@@ -2229,7 +2232,6 @@ static void PM_Weapon( void ) {
pm->ps->pm_flags &= ~PMF_USE_ITEM_HELD;
}*/
-
// make weapon function
if ( pm->ps->weaponTime > 0 ) {
pm->ps->weaponTime -= pml.msec;
@@ -2397,7 +2399,7 @@ static void PM_Weapon( void ) {
addTime = 800;
break;
case WP_FLAMER:
- addTime = 80;
+ addTime = 150;
break;
case WP_RAILGUN:
addTime = 1500;