summaryrefslogtreecommitdiff
path: root/src/game
diff options
context:
space:
mode:
Diffstat (limited to 'src/game')
-rw-r--r--src/game/bg_misc.c84
-rw-r--r--src/game/bg_pmove.c186
-rw-r--r--src/game/bg_public.h6
-rw-r--r--src/game/g_cmds.c126
-rw-r--r--src/game/g_main.c2
-rw-r--r--src/game/tremulous.h3
6 files changed, 268 insertions, 139 deletions
diff --git a/src/game/bg_misc.c b/src/game/bg_misc.c
index 043e28bf..f5f19976 100644
--- a/src/game/bg_misc.c
+++ b/src/game/bg_misc.c
@@ -1186,6 +1186,40 @@ int BG_FindUniqueTestForBuildable( int bclass )
classAttributes_t bg_classList[ ] =
{
{
+ PCL_NONE, //int classnum;
+ "spectator", //char *className;
+ "Spectator", //char *humanName;
+ "", //char *modelname;
+ 1.0f, //float modelScale;
+ "", //char *skinname;
+ "", //char *hudname;
+ ( 1 << S1 )|( 1 << S2 )|( 1 << S3 ), //int stages
+ { -15, -15, -15 }, //vec3_t mins;
+ { 15, 15, 15 }, //vec3_t maxs;
+ { 15, 15, 15 }, //vec3_t crouchmaxs;
+ { -15, -15, -15 }, //vec3_t deadmins;
+ { 15, 15, 15 }, //vec3_t deadmaxs;
+ 0, 0, //int viewheight, crouchviewheight;
+ 0, //int health;
+ 0.0f, //float fallDamage;
+ 0, //int regenRate;
+ 0, //int abilities;
+ WP_NONE, //weapon_t startWeapon
+ 0.0f, //float buildDist;
+ 90, //int fov;
+ 0.000f, //float bob;
+ 1.0f, //float bobCycle;
+ 350, //int steptime;
+ 100, //float speed;
+ 10.0f, //float acceleration;
+ 1.0f, //float airAcceleration;
+ 6.0f, //float friction;
+ 100.0f, //float stopSpeed;
+ 270.0f, //float jumpMagnitude;
+ { PCL_NONE, PCL_NONE, PCL_NONE }, //int children[ 3 ];
+ 0 //int value;
+ },
+ {
PCL_A_B_BASE, //int classnum;
"builder", //char *className;
"Builder", //char *humanName;
@@ -1213,6 +1247,7 @@ classAttributes_t bg_classList[ ] =
350, //int steptime;
ABUILDER_SPEED, //float speed;
10.0f, //float acceleration;
+ 1.0f, //float airAcceleration;
6.0f, //float friction;
100.0f, //float stopSpeed;
130.0f, //float jumpMagnitude;
@@ -1247,6 +1282,7 @@ classAttributes_t bg_classList[ ] =
200, //int steptime;
ABUILDER_UPG_SPEED, //float speed;
10.0f, //float acceleration;
+ 1.0f, //float airAcceleration;
6.0f, //float friction;
100.0f, //float stopSpeed;
270.0f, //float jumpMagnitude;
@@ -1281,9 +1317,10 @@ classAttributes_t bg_classList[ ] =
25, //int steptime;
SOLDIER_SPEED, //float speed;
10.0f, //float acceleration;
+ 1.0f, //float airAcceleration;
6.0f, //float friction;
400.0f, //float stopSpeed;
- 270.0f, //float jumpMagnitude;
+ 250.0f, //float jumpMagnitude;
{ PCL_A_O_LEV1, PCL_NONE, PCL_NONE }, //int children[ 3 ];
SOLDIER_VALUE //int value;
},
@@ -1316,6 +1353,7 @@ classAttributes_t bg_classList[ ] =
25, //int steptime;
HYDRA_SPEED, //float speed;
10.0f, //float acceleration;
+ 1.0f, //float airAcceleration;
6.0f, //float friction;
300.0f, //float stopSpeed;
270.0f, //float jumpMagnitude;
@@ -1351,6 +1389,7 @@ classAttributes_t bg_classList[ ] =
25, //int steptime;
HYDRA_UPG_SPEED, //float speed;
10.0f, //float acceleration;
+ 1.0f, //float airAcceleration;
6.0f, //float friction;
300.0f, //float stopSpeed;
270.0f, //float jumpMagnitude;
@@ -1371,7 +1410,7 @@ classAttributes_t bg_classList[ ] =
{ 22, 22, 22 }, //vec3_t crouchmaxs;
{ -22, -22, -4 }, //vec3_t deadmins;
{ 22, 22, 4 }, //vec3_t deadmaxs;
- 30, 30, //int viewheight, crouchviewheight;
+ 10, 10, //int viewheight, crouchviewheight;
CHIMERA_HEALTH, //int health;
0.0f, //float fallDamage;
CHIMERA_REGEN, //int regenRate;
@@ -1385,9 +1424,10 @@ classAttributes_t bg_classList[ ] =
60, //int steptime;
CHIMERA_SPEED, //float speed;
10.0f, //float acceleration;
+ 2.0f, //float airAcceleration;
6.0f, //float friction;
100.0f, //float stopSpeed;
- 270.0f, //float jumpMagnitude;
+ 400.0f, //float jumpMagnitude;
{ PCL_A_O_LEV3, PCL_A_O_LEV2_UPG, PCL_NONE }, //int children[ 3 ];
CHIMERA_VALUE //int value;
},
@@ -1405,7 +1445,7 @@ classAttributes_t bg_classList[ ] =
{ 24, 24, 24 }, //vec3_t crouchmaxs;
{ -24, -24, -4 }, //vec3_t deadmins;
{ 24, 24, 4 }, //vec3_t deadmaxs;
- 32, 32, //int viewheight, crouchviewheight;
+ 12, 12, //int viewheight, crouchviewheight;
CHIMERA_UPG_HEALTH, //int health;
0.0f, //float fallDamage;
CHIMERA_UPG_REGEN, //int regenRate;
@@ -1419,9 +1459,10 @@ classAttributes_t bg_classList[ ] =
60, //int steptime;
CHIMERA_UPG_SPEED, //float speed;
10.0f, //float acceleration;
+ 2.0f, //float airAcceleration;
6.0f, //float friction;
100.0f, //float stopSpeed;
- 270.0f, //float jumpMagnitude;
+ 400.0f, //float jumpMagnitude;
{ PCL_A_O_LEV3, PCL_NONE, PCL_NONE }, //int children[ 3 ];
CHIMERA_UPG_VALUE //int value;
},
@@ -1453,6 +1494,7 @@ classAttributes_t bg_classList[ ] =
25, //int steptime;
DRAGOON_SPEED, //float speed;
10.0f, //float acceleration;
+ 1.0f, //float airAcceleration;
6.0f, //float friction;
200.0f, //float stopSpeed;
270.0f, //float jumpMagnitude;
@@ -1487,6 +1529,7 @@ classAttributes_t bg_classList[ ] =
25, //int steptime;
DRAGOON_UPG_SPEED, //float speed;
10.0f, //float acceleration;
+ 1.0f, //float airAcceleration;
6.0f, //float friction;
200.0f, //float stopSpeed;
270.0f, //float jumpMagnitude;
@@ -1521,9 +1564,10 @@ classAttributes_t bg_classList[ ] =
60, //int steptime;
BMOFO_SPEED, //float speed;
5.0f, //float acceleration;
+ 1.0f, //float airAcceleration;
6.0f, //float friction;
100.0f, //float stopSpeed;
- 270.0f, //float jumpMagnitude;
+ 170.0f, //float jumpMagnitude;
{ PCL_NONE, PCL_NONE, PCL_NONE }, //int children[ 3 ];
0, //int timetoevolve;
BMOFO_VALUE //int value;
@@ -1556,9 +1600,10 @@ classAttributes_t bg_classList[ ] =
200, //int steptime;
1.0f, //float speed;
10.0f, //float acceleration;
+ 1.0f, //float airAcceleration;
6.0f, //float friction;
100.0f, //float stopSpeed;
- 270.0f, //float jumpMagnitude;
+ 220.0f, //float jumpMagnitude;
{ PCL_NONE, PCL_NONE, PCL_NONE }, //int children[ 3 ];
0, //int timetoevolve;
0 //int value;
@@ -1574,7 +1619,7 @@ classAttributes_t bg_classList[ ] =
"bsuit", ( 1 << S1 )|( 1 << S2 )|( 1 << S3 ), { 0, 0, 0 }, { 0, 0, 0, },
{ 0, 0, 0, }, { 0, 0, 0, }, { 0, 0, 0, }, 0, 0, 0, 0.0f, 0, 0, WP_NONE, 0.0f, 0,
- 0.0f, 1.0f, 0, 1.0f, 1.0f, 1.0f, 1.0f, 270.0f, { PCL_NONE, PCL_NONE, PCL_NONE }, 0, 0
+ 0.0f, 1.0f, 0, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 270.0f, { PCL_NONE, PCL_NONE, PCL_NONE }, 0, 0
}
};
@@ -1992,6 +2037,27 @@ float BG_FindAccelerationForClass( int pclass )
/*
==============
+BG_FindAirAccelerationForClass
+==============
+*/
+float BG_FindAirAccelerationForClass( int pclass )
+{
+ int i;
+
+ for( i = 0; i < bg_numPclasses; i++ )
+ {
+ if( bg_classList[ i ].classNum == pclass )
+ {
+ return bg_classList[ i ].airAcceleration;
+ }
+ }
+
+ Com_Printf( S_COLOR_YELLOW "WARNING: fallthrough in BG_FindAirAccelerationForClass\n" );
+ return 1.0f;
+}
+
+/*
+==============
BG_FindFrictionForClass
==============
*/
@@ -2149,7 +2215,7 @@ int BG_ClassCanEvolveFromTo( int fclass, int tclass, int credits, int num )
if( credits == 0 )
return 0;
- if( tclass == PCL_NONE )
+ if( fclass == PCL_NONE || tclass == PCL_NONE )
return 0;
for( i = 0; i < bg_numPclasses; i++ )
diff --git a/src/game/bg_pmove.c b/src/game/bg_pmove.c
index 50082514..6781a530 100644
--- a/src/game/bg_pmove.c
+++ b/src/game/bg_pmove.c
@@ -388,7 +388,7 @@ static float PM_CmdScale( usercmd_t *cmd )
if( pm->ps->pm_type == PM_GRABBED )
modifier = 0.0f;
- if( pm->ps->persistant[ PERS_TEAM ] != TEAM_SPECTATOR )
+ if( pm->ps->pm_type != PM_SPECTATOR && pm->ps->pm_type != PM_NOCLIP )
{
if( BG_FindJumpMagnitudeForClass( pm->ps->stats[ STAT_PCLASS ] ) == 0.0f )
cmd->upmove = 0;
@@ -487,8 +487,6 @@ PM_CheckPounce
*/
static qboolean PM_CheckPounce( void )
{
- vec3_t forward;
-
if( pm->ps->weapon != WP_POUNCE &&
pm->ps->weapon != WP_POUNCE_UPG )
return qfalse;
@@ -512,9 +510,7 @@ static qboolean PM_CheckPounce( void )
pm->ps->groundEntityNum = ENTITYNUM_NONE;
- AngleVectors( pm->ps->viewangles, forward, NULL, NULL );
- VectorMA( pm->ps->velocity, pm->ps->stats[ STAT_MISC ], forward, pm->ps->velocity );
- pm->ps->velocity[ 2 ] += BG_FindJumpMagnitudeForClass( pm->ps->stats[ STAT_PCLASS ] ) / 2.0f;
+ VectorMA( pm->ps->velocity, pm->ps->stats[ STAT_MISC ], pml.forward, pm->ps->velocity );
PM_AddEvent( EV_JUMP );
@@ -542,6 +538,99 @@ static qboolean PM_CheckPounce( void )
/*
=============
+PM_CheckWallJump
+=============
+*/
+static qboolean PM_CheckWallJump( void )
+{
+ vec3_t dir, forward, right, temp;
+ vec3_t refNormal = { 0.0f, 0.0f, 1.0f };
+ float normalFraction = 1.5f;
+ float cmdFraction = 1.0f;
+ float upFraction = 1.5f;
+
+ if( pm->ps->pm_flags & PMF_RESPAWNED )
+ return qfalse; // don't allow jump until all buttons are up
+
+ if( pm->cmd.upmove < 10 )
+ // not holding jump
+ return qfalse;
+
+ if( pm->ps->pm_flags & PMF_TIME_WALLJUMP )
+ return qfalse;
+
+ // must wait for jump to be released
+ if( pm->ps->pm_flags & PMF_JUMP_HELD &&
+ pm->ps->grapplePoint[ 2 ] == 1.0f )
+ {
+ // clear upmove so cmdscale doesn't lower running speed
+ pm->cmd.upmove = 0;
+ return qfalse;
+ }
+
+ pm->ps->pm_flags |= PMF_TIME_WALLJUMP;
+ pm->ps->pm_time = 200;
+
+ pml.groundPlane = qfalse; // jumping away
+ pml.walking = qfalse;
+ pm->ps->pm_flags |= PMF_JUMP_HELD;
+
+ pm->ps->groundEntityNum = ENTITYNUM_NONE;
+
+ ProjectPointOnPlane( forward, pml.forward, pm->ps->grapplePoint );
+ ProjectPointOnPlane( right, pml.right, pm->ps->grapplePoint );
+
+ VectorScale( pm->ps->grapplePoint, normalFraction, dir );
+
+ if( pm->cmd.forwardmove > 0 )
+ VectorMA( dir, cmdFraction, forward, dir );
+ else if( pm->cmd.forwardmove < 0 )
+ VectorMA( dir, -cmdFraction, forward, dir );
+
+ if( pm->cmd.rightmove > 0 )
+ VectorMA( dir, cmdFraction, right, dir );
+ else if( pm->cmd.rightmove < 0 )
+ VectorMA( dir, -cmdFraction, right, dir );
+
+ VectorMA( dir, upFraction, refNormal, dir );
+ VectorNormalize( dir );
+
+ VectorMA( pm->ps->velocity, BG_FindJumpMagnitudeForClass( pm->ps->stats[ STAT_PCLASS ] ),
+ dir, pm->ps->velocity );
+
+ //for a long run of wall jumps the velocity can get pretty large, this caps it
+ if( VectorLength( pm->ps->velocity ) > CHIMERA_WALLJUMP_MAXSPEED )
+ {
+ VectorNormalize( pm->ps->velocity );
+ VectorScale( pm->ps->velocity, CHIMERA_WALLJUMP_MAXSPEED, pm->ps->velocity );
+ }
+
+ PM_AddEvent( EV_JUMP );
+
+ if( pm->cmd.forwardmove >= 0 )
+ {
+ if( !( pm->ps->persistant[ PERS_STATE ] & PS_NONSEGMODEL ) )
+ PM_ForceLegsAnim( LEGS_JUMP );
+ else
+ PM_ForceLegsAnim( NSPA_JUMP );
+
+ pm->ps->pm_flags &= ~PMF_BACKWARDS_JUMP;
+ }
+ else
+ {
+ if( !( pm->ps->persistant[ PERS_STATE ] & PS_NONSEGMODEL ) )
+ PM_ForceLegsAnim( LEGS_JUMPB );
+ else
+ PM_ForceLegsAnim( NSPA_JUMPBACK );
+
+ pm->ps->pm_flags |= PMF_BACKWARDS_JUMP;
+ }
+
+ return qtrue;
+}
+
+/*
+=============
PM_CheckJump
=============
*/
@@ -550,6 +639,9 @@ static qboolean PM_CheckJump( void )
if( BG_FindJumpMagnitudeForClass( pm->ps->stats[ STAT_PCLASS ] ) == 0.0f )
return qfalse;
+ if( BG_ClassHasAbility( pm->ps->stats[ STAT_PCLASS ], SCA_WALLJUMPER ) )
+ return PM_CheckWallJump( );
+
//can't jump and pounce charge at the same time
if( ( pm->ps->weapon == WP_POUNCE ||
pm->ps->weapon == WP_POUNCE_UPG ) &&
@@ -916,7 +1008,8 @@ static void PM_AirMove( void )
wishspeed *= scale;
// not on ground, so little effect on velocity
- PM_Accelerate( wishdir, wishspeed, pm_airaccelerate );
+ PM_Accelerate( wishdir, wishspeed,
+ BG_FindAirAccelerationForClass( pm->ps->stats[ STAT_PCLASS ] ) );
// we may have a ground plane that is very steep, even
// though we don't have a groundentity
@@ -1042,7 +1135,7 @@ static void PM_ClimbMove( void )
// when a player gets hit, they temporarily lose
// full control, which allows them to be moved a bit
if( ( pml.groundTrace.surfaceFlags & SURF_SLICK ) || pm->ps->pm_flags & PMF_TIME_KNOCKBACK )
- accelerate = pm_airaccelerate;
+ accelerate = BG_FindAirAccelerationForClass( pm->ps->stats[ STAT_PCLASS ] );
else
accelerate = BG_FindAccelerationForClass( pm->ps->stats[ STAT_PCLASS ] );
@@ -1162,7 +1255,7 @@ static void PM_WalkMove( void )
// when a player gets hit, they temporarily lose
// full control, which allows them to be moved a bit
if( ( pml.groundTrace.surfaceFlags & SURF_SLICK ) || pm->ps->pm_flags & PMF_TIME_KNOCKBACK )
- accelerate = pm_airaccelerate;
+ accelerate = BG_FindAirAccelerationForClass( pm->ps->stats[ STAT_PCLASS ] );
else
accelerate = BG_FindAccelerationForClass( pm->ps->stats[ STAT_PCLASS ] );
@@ -1612,7 +1705,7 @@ PM_GroundClimbTrace
*/
static void PM_GroundClimbTrace( void )
{
- vec3_t surfNormal, movedir, lookdir, forward, right, point;
+ vec3_t surfNormal, movedir, lookdir, point;
vec3_t refNormal = { 0.0f, 0.0f, 1.0f };
vec3_t ceilingNormal = { 0.0f, 0.0f, -1.0f };
vec3_t toAngles, surfAngles;
@@ -1637,10 +1730,7 @@ static void PM_GroundClimbTrace( void )
VectorCopy( pm->ps->grapplePoint, surfNormal );
//construct a vector which reflects the direction the player is looking wrt the surface normal
- AngleVectors( pm->ps->viewangles, forward, NULL, NULL );
- CrossProduct( forward, surfNormal, right );
- VectorNormalize( right );
- CrossProduct( surfNormal, right, movedir );
+ ProjectPointOnPlane( movedir, pml.forward, surfNormal );
VectorNormalize( movedir );
VectorCopy( movedir, lookdir );
@@ -1651,7 +1741,7 @@ static void PM_GroundClimbTrace( void )
//allow strafe transitions
if( pm->cmd.rightmove )
{
- VectorCopy( right, movedir );
+ VectorCopy( pml.right, movedir );
if( pm->cmd.rightmove < 0 )
VectorNegate( movedir, movedir );
@@ -1668,13 +1758,13 @@ static void PM_GroundClimbTrace( void )
//trace into direction we are moving
VectorMA( pm->ps->origin, 0.25f, movedir, point );
- pm->trace (&trace, pm->ps->origin, pm->mins, pm->maxs, point, pm->ps->clientNum, pm->tracemask);
+ pm->trace( &trace, pm->ps->origin, pm->mins, pm->maxs, point, pm->ps->clientNum, pm->tracemask );
break;
case 1:
//trace straight down anto "ground" surface
VectorMA( pm->ps->origin, -0.25f, surfNormal, point );
- pm->trace (&trace, pm->ps->origin, pm->mins, pm->maxs, point, pm->ps->clientNum, pm->tracemask);
+ pm->trace( &trace, pm->ps->origin, pm->mins, pm->maxs, point, pm->ps->clientNum, pm->tracemask );
break;
case 2:
@@ -1694,7 +1784,7 @@ static void PM_GroundClimbTrace( void )
{
VectorMA( pm->ps->origin, -16.0f, surfNormal, point );
VectorMA( point, -16.0f, movedir, point );
- pm->trace (&trace, pm->ps->origin, pm->mins, pm->maxs, point, pm->ps->clientNum, pm->tracemask);
+ pm->trace( &trace, pm->ps->origin, pm->mins, pm->maxs, point, pm->ps->clientNum, pm->tracemask );
}
else
continue;
@@ -1703,13 +1793,13 @@ static void PM_GroundClimbTrace( void )
case 4:
//fall back so we don't have to modify PM_GroundTrace too much
VectorCopy( pm->ps->origin, point );
- point[2] = pm->ps->origin[2] - 0.25f;
- pm->trace (&trace, pm->ps->origin, pm->mins, pm->maxs, point, pm->ps->clientNum, pm->tracemask);
+ point[ 2 ] = pm->ps->origin[ 2 ] - 0.25f;
+ pm->trace( &trace, pm->ps->origin, pm->mins, pm->maxs, point, pm->ps->clientNum, pm->tracemask );
break;
}
//if we hit something
- if( trace.fraction < 1.0 && !( trace.surfaceFlags & ( SURF_SKY | SURF_SLICK ) ) &&
+ if( trace.fraction < 1.0f && !( trace.surfaceFlags & ( SURF_SKY | SURF_SLICK ) ) &&
!( trace.entityNum != ENTITYNUM_WORLD && i != 4 ) )
{
if( i == 2 || i == 3 )
@@ -1849,16 +1939,16 @@ static void PM_GroundClimbTrace( void )
//IMPORTANT: break out of the for loop if we've hit something
break;
}
- else if ( trace.allsolid )
+ else if( trace.allsolid )
{
// do something corrective if the trace starts in a solid...
//TA: fuck knows what this does with all my new stuff :(
- if ( !PM_CorrectAllSolid(&trace) )
+ if( !PM_CorrectAllSolid( &trace ) )
return;
}
}
- if ( trace.fraction >= 1.0 )
+ if ( trace.fraction >= 1.0f )
{
// if the trace didn't hit anything, we are in free fall
PM_GroundTraceMissed();
@@ -1899,7 +1989,8 @@ PM_GroundTrace
*/
static void PM_GroundTrace( void )
{
- vec3_t point, forward, srotAxis;
+ vec3_t point, srotAxis;
+ vec3_t movedir;
vec3_t refNormal = { 0.0f, 0.0f, 1.0f };
trace_t trace;
float srotAngle;
@@ -1933,19 +2024,11 @@ static void PM_GroundTrace( void )
pm->ps->stats[ STAT_STATE ] &= ~SS_WALLCLIMBINGCEILING;
pm->ps->eFlags &= ~EF_WALLCLIMB;
- //make sure that the surfNormal is reset to the ground
- if( BG_ClassHasAbility( pm->ps->stats[ STAT_PCLASS ], SCA_WALLCLIMBER ) )
- VectorCopy( refNormal, pm->ps->grapplePoint );
-
point[ 0 ] = pm->ps->origin[ 0 ];
point[ 1 ] = pm->ps->origin[ 1 ];
point[ 2 ] = pm->ps->origin[ 2 ] - 0.25;
- //FIXME: hack until i find out where CONTENTS_BODY is getting unset for uhm.. bodies.
- if( pm->ps->pm_type == PM_DEAD )
- pm->trace( &trace, pm->ps->origin, pm->mins, pm->maxs, point, pm->ps->clientNum, MASK_PLAYERSOLID );
- else
- pm->trace( &trace, pm->ps->origin, pm->mins, pm->maxs, point, pm->ps->clientNum, pm->tracemask );
+ pm->trace( &trace, pm->ps->origin, pm->mins, pm->maxs, point, pm->ps->clientNum, pm->tracemask );
pml.groundTrace = trace;
@@ -1954,6 +2037,9 @@ static void PM_GroundTrace( void )
if( !PM_CorrectAllSolid( &trace ) )
return;
+ //make sure that the surfNormal is reset to the ground
+ VectorCopy( refNormal, pm->ps->grapplePoint );
+
// if the trace didn't hit anything, we are in free fall
if( trace.fraction == 1.0 )
{
@@ -1961,6 +2047,38 @@ static void PM_GroundTrace( void )
pml.groundPlane = qfalse;
pml.walking = qfalse;
+ if( BG_ClassHasAbility( pm->ps->stats[ STAT_PCLASS ], SCA_WALLJUMPER ) )
+ {
+ ProjectPointOnPlane( movedir, pml.forward, refNormal );
+ VectorNormalize( movedir );
+
+ if( pm->cmd.forwardmove < 0 )
+ VectorNegate( movedir, movedir );
+
+ //allow strafe transitions
+ if( pm->cmd.rightmove )
+ {
+ VectorCopy( pml.right, movedir );
+
+ if( pm->cmd.rightmove < 0 )
+ VectorNegate( movedir, movedir );
+ }
+
+ //trace into direction we are moving
+ VectorMA( pm->ps->origin, 0.25f, movedir, point );
+ pm->trace( &trace, pm->ps->origin, pm->mins, pm->maxs, point, pm->ps->clientNum, pm->tracemask );
+
+ if( trace.fraction < 1.0f && !( trace.surfaceFlags & ( SURF_SKY | SURF_SLICK ) ) &&
+ ( trace.entityNum == ENTITYNUM_WORLD ) )
+ {
+ if( !VectorCompare( trace.plane.normal, pm->ps->grapplePoint ) )
+ {
+ VectorCopy( trace.plane.normal, pm->ps->grapplePoint );
+ PM_CheckWallJump( );
+ }
+ }
+ }
+
return;
}
diff --git a/src/game/bg_public.h b/src/game/bg_public.h
index 6fdb8546..c76132de 100644
--- a/src/game/bg_public.h
+++ b/src/game/bg_public.h
@@ -138,11 +138,11 @@ typedef enum
#define PMF_GRAPPLE_PULL 2048 // pull towards grapple location
#define PMF_FOLLOW 4096 // spectate following another player
#define PMF_SCOREBOARD 8192 // spectate as a scoreboard
-#define PMF_INVULEXPAND 16384 // invulnerability sphere set to full size
+#define PMF_TIME_WALLJUMP 16384 //TA: for limiting wall jumping
#define PMF_CHARGE 32768 //TA: keep track of pouncing
-#define PMF_ALL_TIMES (PMF_TIME_WATERJUMP|PMF_TIME_LAND|PMF_TIME_KNOCKBACK)
+#define PMF_ALL_TIMES (PMF_TIME_WATERJUMP|PMF_TIME_LAND|PMF_TIME_KNOCKBACK|PMF_TIME_WALLJUMP)
#define MAXTOUCH 32
typedef struct
@@ -895,6 +895,7 @@ typedef struct
float speed;
float acceleration;
+ float airAcceleration;
float friction;
float stopSpeed;
float jumpMagnitude;
@@ -1087,6 +1088,7 @@ float BG_FindBobForClass( int pclass );
float BG_FindBobCycleForClass( int pclass );
float BG_FindSpeedForClass( int pclass );
float BG_FindAccelerationForClass( int pclass );
+float BG_FindAirAccelerationForClass( int pclass );
float BG_FindFrictionForClass( int pclass );
float BG_FindStopSpeedForClass( int pclass );
float BG_FindJumpMagnitudeForClass( int pclass );
diff --git a/src/game/g_cmds.c b/src/game/g_cmds.c
index 12cc7dff..9342c789 100644
--- a/src/game/g_cmds.c
+++ b/src/game/g_cmds.c
@@ -715,6 +715,7 @@ void Cmd_CallTeamVote_f( gentity_t *ent )
char arg2[ MAX_STRING_TOKENS ];
team = ent->client->ps.stats[ STAT_PTEAM ];
+
if( team == PTE_HUMANS )
cs_offset = 0;
else if( team == PTE_ALIENS )
@@ -748,77 +749,51 @@ void Cmd_CallTeamVote_f( gentity_t *ent )
// make sure it is a valid command to vote on
trap_Argv( 1, arg1, sizeof( arg1 ) );
- arg2[ 0 ] = '\0';
+ trap_Argv( 2, arg2, sizeof( arg2 ) );
- for( i = 2; i < trap_Argc( ); i++ )
- {
- if( i > 2 )
- strcat( arg2, " " );
-
- trap_Argv( i, &arg2[ strlen( arg2 ) ], sizeof( arg2 ) - strlen( arg2 ) );
- }
-
if( strchr( arg1, ';' ) || strchr( arg2, ';' ) )
{
- trap_SendServerCommand( ent-g_entities, "print \"Invalid vote string.\n\"" );
+ trap_SendServerCommand( ent-g_entities, "print \"Invalid team vote string.\n\"" );
return;
}
+ if( !Q_stricmp( arg1, "teamkick" ) )
+ {
+ char netname[ MAX_NETNAME ], kickee[ MAX_NETNAME ];
- /*if ( !Q_stricmp( arg1, "leader" ) ) {
- char netname[MAX_NETNAME], leader[MAX_NETNAME];
-
- if ( !arg2[0] ) {
- i = ent->client->ps.clientNum;
+ Q_strncpyz( kickee, arg2, sizeof( kickee ) );
+ Q_CleanStr( kickee );
+
+ for( i = 0; i < level.maxclients; i++ )
+ {
+ if( level.clients[ i ].pers.connected == CON_DISCONNECTED )
+ continue;
+
+ if( level.clients[ i ].ps.stats[ STAT_PTEAM ] != team )
+ continue;
+
+ Q_strncpyz( netname, level.clients[ i ].pers.netname, sizeof( netname ) );
+ Q_CleanStr( netname );
+
+ if( !Q_stricmp( netname, kickee ) )
+ break;
}
- else {
- // numeric values are just slot numbers
- for (i = 0; i < 3; i++) {
- if ( !arg2[i] || arg2[i] < '0' || arg2[i] > '9' )
- break;
- }
- if ( i >= 3 || !arg2[i]) {
- i = atoi( arg2 );
- if ( i < 0 || i >= level.maxclients ) {
- trap_SendServerCommand( ent-g_entities, va("print \"Bad client slot: %i\n\"", i) );
- return;
- }
-
- if ( !g_entities[i].inuse ) {
- trap_SendServerCommand( ent-g_entities, va("print \"Client %i is not active\n\"", i) );
- return;
- }
- }
- else {
- Q_strncpyz(leader, arg2, sizeof(leader));
- Q_CleanStr(leader);
- for ( i = 0 ; i < level.maxclients ; i++ ) {
- if ( level.clients[i].pers.connected == CON_DISCONNECTED )
- continue;
- if (level.clients[i].sess.sessionTeam != team)
- continue;
- Q_strncpyz(netname, level.clients[i].pers.netname, sizeof(netname));
- Q_CleanStr(netname);
- if ( !Q_stricmp(netname, leader) ) {
- break;
- }
- }
- if ( i >= level.maxclients ) {
- trap_SendServerCommand( ent-g_entities, va("print \"%s is not a valid player on your team.\n\"", arg2) );
- return;
- }
- }
+
+ if( i >= level.maxclients )
+ {
+ trap_SendServerCommand( ent-g_entities, va( "print \"%s is not a valid player on your team.\n\"", arg2 ) );
+ return;
}
- Com_sprintf(arg2, sizeof(arg2), "%d", i);
- } else*/
+ }
+ else
{
trap_SendServerCommand( ent-g_entities, "print \"Invalid vote string.\n\"" );
- trap_SendServerCommand( ent-g_entities, "print \"Team vote commands are: leader <player>.\n\"" );
+ trap_SendServerCommand( ent-g_entities, "print \"Team vote commands are: teamkick <player>.\n\"" );
return;
}
-/* Com_sprintf( level.teamVoteString[ cs_offset ],
- sizeof( level.teamVoteString[ cs_offset ] ), "%s %s", arg1, arg2 );
+ Com_sprintf( level.teamVoteString[ cs_offset ],
+ sizeof( level.teamVoteString[ cs_offset ] ), "kick \"%s\"", arg2 );
for( i = 0 ; i < level.maxclients ; i++ )
{
@@ -836,7 +811,7 @@ void Cmd_CallTeamVote_f( gentity_t *ent )
for( i = 0 ; i < level.maxclients ; i++ )
{
- if( level.clients[ i ].ps.stats[ STAT_PTEAM ] == team)
+ if( level.clients[ i ].ps.stats[ STAT_PTEAM ] == team )
level.clients[ i ].ps.eFlags &= ~EF_TEAMVOTED;
}
@@ -845,7 +820,7 @@ void Cmd_CallTeamVote_f( gentity_t *ent )
trap_SetConfigstring( CS_TEAMVOTE_TIME + cs_offset, va( "%i", level.teamVoteTime[ cs_offset ] ) );
trap_SetConfigstring( CS_TEAMVOTE_STRING + cs_offset, level.teamVoteString[ cs_offset ] );
trap_SetConfigstring( CS_TEAMVOTE_YES + cs_offset, va( "%i", level.teamVoteYes[ cs_offset ] ) );
- trap_SetConfigstring( CS_TEAMVOTE_NO + cs_offset, va( "%i", level.teamVoteNo[ cs_offset ] ) );*/
+ trap_SetConfigstring( CS_TEAMVOTE_NO + cs_offset, va( "%i", level.teamVoteNo[ cs_offset ] ) );
}
@@ -1690,37 +1665,6 @@ void Cmd_Boost_f( gentity_t *ent )
/*
=================
-Cmd_Spawnbody_f
-=================
-*/
-void Cmd_Spawnbody_f( gentity_t *ent )
-{
- gentity_t *dummy = G_Spawn( );
- vec3_t forward;
-
- if( !CheatsOk( ent ) )
- return;
-
- AngleVectors( ent->client->ps.viewangles, forward, NULL, NULL );
- forward[ 2 ] = 0.0f;
-
- VectorMA( ent->client->ps.origin, 128.0f, forward, dummy->r.currentOrigin );
- dummy->r.currentOrigin[ 2 ] += 64.0f;
-
- dummy->client = level.clients + MAX_CLIENTS;
-
- dummy->client->ps.stats[ STAT_PTEAM ] = PTE_HUMANS;
- dummy->client->ps.stats[ STAT_PCLASS ] = PCL_H_BASE;
-
- dummy->client->lasthurt_client = dummy->client->ps.clientNum = -1;
-
- SpawnCorpse( dummy );
-
- G_FreeEntity( dummy );
-}
-
-/*
-=================
Cmd_Test_f
=================
*/
@@ -1830,8 +1774,6 @@ void ClientCommand( int clientNum )
Cmd_TeamVote_f( ent );
else if( Q_stricmp( cmd, "setviewpos" ) == 0 )
Cmd_SetViewpos_f( ent );
- else if( Q_stricmp( cmd, "spawnbody" ) == 0 )
- Cmd_Spawnbody_f( ent );
else if( Q_stricmp( cmd, "test" ) == 0 )
Cmd_Test_f( ent );
else
diff --git a/src/game/g_main.c b/src/game/g_main.c
index f74f7e7d..0218ac58 100644
--- a/src/game/g_main.c
+++ b/src/game/g_main.c
@@ -1330,7 +1330,7 @@ void CheckVote( void )
if( level.voteExecuteTime && level.voteExecuteTime < level.time )
{
level.voteExecuteTime = 0;
- trap_SendConsoleCommand( EXEC_APPEND, va("%s\n", level.voteString ) );
+ trap_SendConsoleCommand( EXEC_APPEND, va( "%s\n", level.voteString ) );
}
if( !level.voteTime )
diff --git a/src/game/tremulous.h b/src/game/tremulous.h
index b0ec7341..ca7c48d8 100644
--- a/src/game/tremulous.h
+++ b/src/game/tremulous.h
@@ -57,6 +57,7 @@
#define CHIMERA_DIRECTZAP_DMG ADM(100)
#define CHIMERA_DIRECTZAP_RANGE 200.0f
#define CHIMERA_DIRECTZAP_REPEAT 1500
+#define CHIMERA_WALLJUMP_MAXSPEED 1000.0f
#define DRAGOON_CLAW_DMG ADM(75)
#define DRAGOON_CLAW_RANGE 96.0f
@@ -64,7 +65,7 @@
#define DRAGOON_CLAW_U_REPEAT 500
#define DRAGOON_POUNCE_DMG ADM(200)
#define DRAGOON_POUNCE_RANGE 96.0f
-#define DRAGOON_POUNCE_SPEED 750
+#define DRAGOON_POUNCE_SPEED 600
#define DRAGOON_POUNCE_SPEED_MOD 0.75f
#define DRAGOON_POUNCE_TIME 1000
#define DRAGOON_SLOWBLOB_DMG ADM(20)
generated by cgit (git 2.34.1) at 2025-04-03 06:48:48 +0000