diff --git a/code/game/g_local.h b/code/game/g_local.h index 1a55955..bbad948 100644 --- a/code/game/g_local.h +++ b/code/game/g_local.h @@ -765,6 +765,44 @@ extern vmCvar_t g_enableBreath; extern vmCvar_t g_singlePlayer; extern vmCvar_t g_proxMineTimeout; +#ifdef MISSIONPACK +// QL pmove_ cvars +extern vmCvar_t pmove_WishSpeed; +extern vmCvar_t pmove_WalkAccel; +extern vmCvar_t pmove_WalkFriction; +extern vmCvar_t pmove_StepHeight; +extern vmCvar_t pmove_noPlayerClip; +extern vmCvar_t pmove_AirAccel; +extern vmCvar_t pmove_AirStopAccel; +extern vmCvar_t pmove_AirControl; +extern vmCvar_t pmove_AirSteps; +extern vmCvar_t pmove_AutoHop; +extern vmCvar_t pmove_BunnyHop; +extern vmCvar_t pmove_JumpVelocity; +extern vmCvar_t pmove_JumpVelocityMax; +extern vmCvar_t pmove_JumpVelocityScaleAdd; +extern vmCvar_t pmove_JumpVelocityTimeThreshold; +extern vmCvar_t pmove_JumpTimeDeltaMin; +extern vmCvar_t pmove_DoubleJump; +extern vmCvar_t pmove_StepJump; +extern vmCvar_t pmove_StepJumpVelocity; +extern vmCvar_t pmove_CrouchStepJump; +extern vmCvar_t pmove_RampJump; +extern vmCvar_t pmove_RampJumpScale; +extern vmCvar_t pmove_ChainJump; +extern vmCvar_t pmove_ChainJumpVelocity; +extern vmCvar_t pmove_CrouchSlide; +extern vmCvar_t pmove_CrouchSlideTime; +extern vmCvar_t pmove_CrouchSlideFriction; +extern vmCvar_t pmove_StrafeAccel; +extern vmCvar_t pmove_CircleStrafeFriction; +extern vmCvar_t pmove_WaterSwimScale; +extern vmCvar_t pmove_WaterWadeScale; +extern vmCvar_t pmove_WeaponDropTime; +extern vmCvar_t pmove_WeaponRaiseTime; +extern vmCvar_t pmove_velocity_gh; +#endif + void trap_Printf( const char *fmt ); void trap_Error( const char *fmt ); int trap_Milliseconds( void ); diff --git a/code/game/g_main.c b/code/game/g_main.c index 9f60272..8cecc88 100644 --- a/code/game/g_main.c +++ b/code/game/g_main.c @@ -93,6 +93,42 @@ vmCvar_t g_singlePlayer; vmCvar_t g_enableDust; vmCvar_t g_enableBreath; vmCvar_t g_proxMineTimeout; + +// QL pmove_ cvars +vmCvar_t pmove_WishSpeed; +vmCvar_t pmove_WalkAccel; +vmCvar_t pmove_WalkFriction; +vmCvar_t pmove_StepHeight; +vmCvar_t pmove_noPlayerClip; +vmCvar_t pmove_AirAccel; +vmCvar_t pmove_AirStopAccel; +vmCvar_t pmove_AirControl; +vmCvar_t pmove_AirSteps; +vmCvar_t pmove_AutoHop; +vmCvar_t pmove_BunnyHop; +vmCvar_t pmove_JumpVelocity; +vmCvar_t pmove_JumpVelocityMax; +vmCvar_t pmove_JumpVelocityScaleAdd; +vmCvar_t pmove_JumpVelocityTimeThreshold; +vmCvar_t pmove_JumpTimeDeltaMin; +vmCvar_t pmove_DoubleJump; +vmCvar_t pmove_StepJump; +vmCvar_t pmove_StepJumpVelocity; +vmCvar_t pmove_CrouchStepJump; +vmCvar_t pmove_RampJump; +vmCvar_t pmove_RampJumpScale; +vmCvar_t pmove_ChainJump; +vmCvar_t pmove_ChainJumpVelocity; +vmCvar_t pmove_CrouchSlide; +vmCvar_t pmove_CrouchSlideTime; +vmCvar_t pmove_CrouchSlideFriction; +vmCvar_t pmove_StrafeAccel; +vmCvar_t pmove_CircleStrafeFriction; +vmCvar_t pmove_WaterSwimScale; +vmCvar_t pmove_WaterWadeScale; +vmCvar_t pmove_WeaponDropTime; +vmCvar_t pmove_WeaponRaiseTime; +vmCvar_t pmove_velocity_gh; #endif // bk001129 - made static to avoid aliasing @@ -173,6 +209,49 @@ static cvarTable_t gameCvarTable[] = { { &g_enableDust, "g_enableDust", "0", CVAR_SERVERINFO, 0, qtrue, qfalse }, { &g_enableBreath, "g_enableBreath", "0", CVAR_SERVERINFO, 0, qtrue, qfalse }, { &g_proxMineTimeout, "g_proxMineTimeout", "20000", 0, 0, qfalse }, + + // QL pmove_ cvars — ground + { &pmove_WishSpeed, "pmove_WishSpeed", "400.0", 0, 0, qfalse }, + { &pmove_WalkAccel, "pmove_WalkAccel", "10.0", 0, 0, qfalse }, + { &pmove_WalkFriction, "pmove_WalkFriction", "6", 0, 0, qfalse }, + { &pmove_StepHeight, "pmove_StepHeight", "22.0", 0, 0, qfalse }, + { &pmove_noPlayerClip, "pmove_noPlayerClip", "0", 0, 0, qfalse }, + // QL pmove_ cvars — air + { &pmove_AirAccel, "pmove_AirAccel", "1", 0, 0, qfalse }, + { &pmove_AirStopAccel, "pmove_AirStopAccel", "1", 0, 0, qfalse }, + { &pmove_AirControl, "pmove_AirControl", "0", 0, 0, qfalse }, + { &pmove_AirSteps, "pmove_AirSteps", "1", 0, 0, qfalse }, + // QL pmove_ cvars — jumping + { &pmove_AutoHop, "pmove_AutoHop", "1", 0, 0, qfalse }, + { &pmove_BunnyHop, "pmove_BunnyHop", "1", 0, 0, qfalse }, + { &pmove_JumpVelocity, "pmove_JumpVelocity", "275.0", 0, 0, qfalse }, + { &pmove_JumpVelocityMax, "pmove_JumpVelocityMax", "700.0", 0, 0, qfalse }, + { &pmove_JumpVelocityScaleAdd, "pmove_JumpVelocityScaleAdd", "0", 0, 0, qfalse }, + { &pmove_JumpVelocityTimeThreshold, "pmove_JumpVelocityTimeThreshold", "500.0", 0, 0, qfalse }, + { &pmove_JumpTimeDeltaMin, "pmove_JumpTimeDeltaMin", "100.0", 0, 0, qfalse }, + { &pmove_DoubleJump, "pmove_DoubleJump", "0", 0, 0, qfalse }, + { &pmove_StepJump, "pmove_StepJump", "1", 0, 0, qfalse }, + { &pmove_StepJumpVelocity, "pmove_StepJumpVelocity", "48.0", 0, 0, qfalse }, + { &pmove_CrouchStepJump, "pmove_CrouchStepJump", "1", 0, 0, qfalse }, + { &pmove_RampJump, "pmove_RampJump", "0", 0, 0, qfalse }, + { &pmove_RampJumpScale, "pmove_RampJumpScale", "1", 0, 0, qfalse }, + { &pmove_ChainJump, "pmove_ChainJump", "1", 0, 0, qfalse }, + { &pmove_ChainJumpVelocity, "pmove_ChainJumpVelocity", "110.0", 0, 0, qfalse }, + // QL pmove_ cvars — crouch slide + { &pmove_CrouchSlide, "pmove_CrouchSlide", "0", 0, 0, qfalse }, + { &pmove_CrouchSlideTime, "pmove_CrouchSlideTime", "2", 0, 0, qfalse }, + { &pmove_CrouchSlideFriction, "pmove_CrouchSlideFriction", "0.5", 0, 0, qfalse }, + // QL pmove_ cvars — strafe + { &pmove_StrafeAccel, "pmove_StrafeAccel", "1", 0, 0, qfalse }, + { &pmove_CircleStrafeFriction, "pmove_CircleStrafeFriction", "6", 0, 0, qfalse }, + // QL pmove_ cvars — water + { &pmove_WaterSwimScale, "pmove_WaterSwimScale", "0", 0, 0, qfalse }, + { &pmove_WaterWadeScale, "pmove_WaterWadeScale", "0", 0, 0, qfalse }, + // QL pmove_ cvars — weapon timing + { &pmove_WeaponDropTime, "pmove_WeaponDropTime", "2", 0, 0, qfalse }, + { &pmove_WeaponRaiseTime, "pmove_WeaponRaiseTime", "2", 0, 0, qfalse }, + // QL pmove_ cvars — misc + { &pmove_velocity_gh, "pmove_velocity_gh", "8", 0, 0, qfalse }, #endif { &g_smoothClients, "g_smoothClients", "1", 0, 0, qfalse}, { &pmove_fixed, "pmove_fixed", "0", CVAR_SYSTEMINFO, 0, qfalse},