Skip to content

Few changes #156

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
Krolot wants to merge 6 commits into from
Closed

Few changes #156

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
44863a4
cl_righthand restored
Krolot Mar 30, 2026
0215496
few command values changed
Krolot Mar 30, 2026
8122941
restored autojump
Krolot Mar 30, 2026
7a6ae6d
Fall damage (fixed) now is configurable
Krolot Mar 30, 2026
9f18722
Solved issue with grav gun
Krolot Mar 30, 2026
6e17766
Restored per material footsteps
Krolot Apr 1, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions src/game/client/c_baseviewmodel.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,9 @@
// memdbgon must be the last include file in a .cpp file!!!
#include "tier0/memdbgon.h"

#ifdef CSTRIKE_DLL
//#ifdef CSTRIKE_DLL
Copy link
Copy Markdown
Member

@TEAMJBMOD TEAMJBMOD Apr 1, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Instead of commenting out preprocessors in common code, please add JBMod instead - ie do something like #if defined(CSTRIKE_DLL) || defined(JBMOD)

ConVar cl_righthand( "cl_righthand", "1", FCVAR_ARCHIVE, "Use right-handed view models." );
#endif
//#endif

#ifdef TF_CLIENT_DLL
ConVar cl_flipviewmodels( "cl_flipviewmodels", "0", FCVAR_USERINFO | FCVAR_ARCHIVE | FCVAR_NOT_CONNECTED, "Flip view models." );
Expand Down Expand Up @@ -214,15 +214,15 @@ bool C_BaseViewModel::Interpolate( float currentTime )

bool C_BaseViewModel::ShouldFlipViewModel()
{
#ifdef CSTRIKE_DLL
//#ifdef CSTRIKE_DLL
Copy link
Copy Markdown
Member

@TEAMJBMOD TEAMJBMOD Apr 1, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same as above

// If cl_righthand is set, then we want them all right-handed.
CBaseCombatWeapon *pWeapon = m_hWeapon.Get();
if ( pWeapon )
{
const FileWeaponInfo_t *pInfo = &pWeapon->GetWpnData();
return pInfo->m_bAllowFlipping && pInfo->m_bBuiltRightHanded != cl_righthand.GetBool();
}
#endif
//#endif

#ifdef TF_CLIENT_DLL
CBaseCombatWeapon *pWeapon = m_hWeapon.Get();
Expand Down
4 changes: 2 additions & 2 deletions src/game/server/game.cpp
View file
Open in desktop
Copy link
Copy Markdown
Member

@TEAMJBMOD TEAMJBMOD Apr 1, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same comments as above re: cvars, but even more so since this is in common code. Please revert.

Original file line number Diff line number Diff line change
Expand Up @@ -31,14 +31,14 @@ ConVar lservercfgfile( "lservercfgfile","listenserver.cfg" );

// multiplayer server rules
ConVar teamplay( "mp_teamplay","0", FCVAR_NOTIFY );
ConVar falldamage( "mp_falldamage","0", FCVAR_NOTIFY );
ConVar falldamage( "mp_falldamage","0", FCVAR_NOTIFY, "If set to 0 it will return a fixed value, by the cvar mp_falldamage_amount, if set to 1 it uses realistic falldamage");
ConVar weaponstay( "mp_weaponstay","0", FCVAR_NOTIFY );
ConVar forcerespawn( "mp_forcerespawn","1", FCVAR_NOTIFY );
ConVar footsteps( "mp_footsteps","1", FCVAR_NOTIFY );
#ifdef CSTRIKE
ConVar flashlight( "mp_flashlight","1", FCVAR_NOTIFY );
#else
ConVar flashlight( "mp_flashlight","0", FCVAR_NOTIFY );
ConVar flashlight( "mp_flashlight","1", FCVAR_NOTIFY );
#endif
ConVar aimcrosshair( "mp_autocrosshair","1", FCVAR_NOTIFY );
ConVar decalfrequency( "decalfrequency","10", FCVAR_NOTIFY );
Expand Down
45 changes: 1 addition & 44 deletions src/game/server/hl2/hl2_player.cpp
View file
Open in desktop
Copy link
Copy Markdown
Member

@TEAMJBMOD TEAMJBMOD Apr 1, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We should prefer not removing unused code from common files, as it makes syncing upstream more difficult.
In this case it seems you're only using this because you want to use sv_autojump for something unrelated, so this won't be accepted.

Original file line number Diff line number Diff line change
Expand Up @@ -81,8 +81,6 @@ extern ConVar autoaim_max_dist;

extern int gEvilImpulse101;

ConVar sv_autojump( "sv_autojump", "0" );

ConVar hl2_walkspeed( "hl2_walkspeed", "150", FCVAR_REPLICATED );
ConVar hl2_normspeed( "hl2_normspeed", "190", FCVAR_REPLICATED );
ConVar hl2_sprintspeed( "hl2_sprintspeed", "320", FCVAR_REPLICATED );
Expand Down Expand Up @@ -651,48 +649,7 @@ void CHL2_Player::PreThink(void)
return;
}

// This is an experiment of mine- autojumping!
// only affects you if sv_autojump is nonzero.
if( (GetFlags() & FL_ONGROUND) && sv_autojump.GetFloat() != 0 )
{
VPROF( "CHL2_Player::PreThink-Autojump" );
// check autojump
Vector vecCheckDir;

vecCheckDir = GetAbsVelocity();

float flVelocity = VectorNormalize( vecCheckDir );

if( flVelocity > 200 )
{
// Going fast enough to autojump
vecCheckDir = WorldSpaceCenter() + vecCheckDir * 34 - Vector( 0, 0, 16 );

trace_t tr;

UTIL_TraceHull( WorldSpaceCenter() - Vector( 0, 0, 16 ), vecCheckDir, NAI_Hull::Mins(HULL_TINY_CENTERED),NAI_Hull::Maxs(HULL_TINY_CENTERED), MASK_PLAYERSOLID, this, COLLISION_GROUP_PLAYER, &tr );

//NDebugOverlay::Line( tr.startpos, tr.endpos, 0,255,0, true, 10 );

if( tr.fraction == 1.0 && !tr.startsolid )
{
// Now trace down!
UTIL_TraceLine( vecCheckDir, vecCheckDir - Vector( 0, 0, 64 ), MASK_PLAYERSOLID, this, COLLISION_GROUP_NONE, &tr );

//NDebugOverlay::Line( tr.startpos, tr.endpos, 0,255,0, true, 10 );

if( tr.fraction == 1.0 && !tr.startsolid )
{
// !!!HACKHACK
// I KNOW, I KNOW, this is definitely not the right way to do this,
// but I'm prototyping! (sjb)
Vector vecNewVelocity = GetAbsVelocity();
vecNewVelocity.z += 250;
SetAbsVelocity( vecNewVelocity );
}
}
}
}


VPROF_SCOPE_BEGIN( "CHL2_Player::PreThink-Speed" );

Expand Down
2 changes: 1 addition & 1 deletion src/game/server/jbmod/jbmod_player.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -408,7 +408,7 @@ bool CJBMod_Player::ValidatePlayerModel( const char *pModel )
return false;
}

ConVar jbmod_allow_pickup( "jbmod_allow_pickup", "0", FCVAR_GAMEDLL );
ConVar jbmod_allow_pickup( "jbmod_allow_pickup", "1", FCVAR_GAMEDLL );
Copy link
Copy Markdown
Member

@TEAMJBMOD TEAMJBMOD Apr 1, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Gameplay changes should be made in gamemodes, not C++ level cvars.
Most cvars here are placeholders and will be refactored into vscript, I see no reason to change this now.


void CJBMod_Player::PickupObject( CBaseEntity* pObject, bool bLimitMassAndSize )
{
Expand Down
5 changes: 5 additions & 0 deletions src/game/server/props.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2746,6 +2746,11 @@ void CPhysicsProp::OnPhysGunPickup( CBasePlayer *pPhysGunUser, PhysGunPickup_t r

if( reason == PICKED_UP_BY_CANNON )
{
if (m_bFirstCollisionAfterLaunch)
{
PhysClearGameFlags(pPhysicsObject, FVPHYSICS_WAS_THROWN);
m_bFirstCollisionAfterLaunch = false;
}
m_OnPhysGunOnlyPickup.FireOutput( pPhysGunUser, this );
}

Expand Down
3 changes: 2 additions & 1 deletion src/game/shared/gamemovement.cpp
View file
Open in desktop
Copy link
Copy Markdown
Member

@TEAMJBMOD TEAMJBMOD Apr 1, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This isn't consistent with 0.5 as we already called this sv_autobhop.
Also we're already replacing shared gamemovement in a refactor so this isn't where this change will belong.

Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@ ConVar player_limit_jump_speed( "player_limit_jump_speed", "1", FCVAR_REPLICATED
// duck controls. Its value is meaningless anytime we don't have the options window open.
ConVar option_duck_method("option_duck_method", "1", FCVAR_REPLICATED|FCVAR_ARCHIVE );// 0 = HOLD to duck, 1 = Duck is a toggle

ConVar sv_autojump("sv_autojump", "0", FCVAR_REPLICATED | FCVAR_NOTIFY);

// [MD] I'll remove this eventually. For now, I want the ability to A/B the optimizations.
bool g_bMovementOptimizations = true;
Expand Down Expand Up @@ -2425,7 +2426,7 @@ bool CGameMovement::CheckJumpButton( void )
return false;
#endif

if ( mv->m_nOldButtons & IN_JUMP )
if ( mv->m_nOldButtons & IN_JUMP && !sv_autojump.GetBool())
return false; // don't pogo stick

// Cannot jump will in the unduck transition.
Expand Down
7 changes: 7 additions & 0 deletions src/game/shared/jbmod/jbmod_player_shared.cpp
View file
Open in desktop
Copy link
Copy Markdown
Member

@TEAMJBMOD TEAMJBMOD Apr 1, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Step sounds here are deprecated and will be removed from this file, this change won't be accepted.

Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
#include "SoundEmitterSystem/isoundemittersystembase.h"

extern ConVar sv_footsteps;
ConVar sv_material_footsteps("sv_material_footsteps", "1", FCVAR_REPLICATED, "0: HL2DM Footsteps, 1: Material Footsteps");

const char *g_ppszPlayerSoundPrefixNames[PLAYER_SOUNDS_MAX] =
{
Expand Down Expand Up @@ -70,6 +71,12 @@ Vector CJBMod_Player::GetAttackSpread( CBaseCombatWeapon *pWeapon, CBaseEntity *
//-----------------------------------------------------------------------------
void CJBMod_Player::PlayStepSound( Vector &vecOrigin, surfacedata_t *psurface, float fvol, bool force )
{
if (sv_material_footsteps.GetBool())
{
BaseClass::PlayStepSound(vecOrigin, psurface, fvol, force);
return;
}

if ( gpGlobals->maxClients > 1 && !sv_footsteps.GetFloat() )
return;

Expand Down
7 changes: 5 additions & 2 deletions src/game/shared/multiplay_gamerules.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,8 @@ ConVar mp_restartgame_immediate( "mp_restartgame_immediate", "0", FCVAR_GAMEDLL,

ConVar mp_mapcycle_empty_timeout_seconds( "mp_mapcycle_empty_timeout_seconds", "0", FCVAR_REPLICATED, "If nonzero, server will cycle to the next map if it has been empty on the current map for N seconds");

ConVar mp_falldamage_amount("mp_falldamage_amount", "10.0", FCVAR_REPLICATED | FCVAR_NOTIFY, "If you put 10 you will loose 10, only works if mp_falldamge equals 0");

void cc_SkipNextMapInCycle()
{
if ( !UTIL_IsCommandIssuedByServerAdmin() )
Expand Down Expand Up @@ -626,6 +628,7 @@ ConVarRef suitcharger( "sk_suitcharger" );

//=========================================================
//=========================================================
//This seems to be the block of code that checks for fall damage and calculates it
Copy link
Copy Markdown
Member

@TEAMJBMOD TEAMJBMOD Apr 1, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Remove unnecessary comment

float CMultiplayRules::FlPlayerFallDamage( CBasePlayer *pPlayer )
{
int iFallDamage = (int)falldamage.GetFloat();
Expand All @@ -637,8 +640,8 @@ ConVarRef suitcharger( "sk_suitcharger" );
return pPlayer->m_Local.m_flFallVelocity * DAMAGE_FOR_FALL_SPEED;
break;
default:
case 0:// fixed
return 10;
case 0:// fixed by the cvar mp_falldamage_amount
return mp_falldamage_amount.GetFloat();
break;
}
}
Expand Down
Loading