Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
18 changes: 14 additions & 4 deletions .github/workflows/pull-request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,9 @@ on:

jobs:
windows:
strategy:
matrix:
arch: ['x64', 'x86']
runs-on: windows-latest
steps:
- uses: actions/checkout@v6
Expand All @@ -19,22 +22,29 @@ jobs:

- name: Create project files
working-directory: ${{ github.workspace }}/src
run: devtools\bin\vpc.exe /win64 /jbmod /define:SOURCESDK +everything /mksln x64.sln
run: devtools\bin\vpc.exe /${{ matrix.arch == 'x86' && 'win32' || 'win64' }} /jbmod /define:SOURCESDK +everything /mksln ${{ matrix.arch }}.sln

- name: Build
working-directory: ${{ github.workspace }}/src
run: msbuild /m /p:Configuration=Release x64.sln
run: msbuild /m /p:Configuration=Release ${{ matrix.arch }}.sln

linux:
strategy:
matrix:
arch: ['x64', 'x86']
runs-on: ubuntu-latest
container: registry.gitlab.steamos.cloud/steamrt/sniper/sdk:latest
steps:
- uses: actions/checkout@v6

- name: Create project files
working-directory: ${{ github.workspace }}/src
run: VPC_NINJA_BUILD_MODE=Release devtools/bin/vpc /linux64 /jbmod /ninja /define:SOURCESDK +everything /mksln _vpc_/ninja/x64
run: |
VPC_NINJA_BUILD_MODE=Release devtools/bin/vpc /${{ matrix.arch == 'x86' && 'linux32' || 'linux64' }} /jbmod /ninja /define:SOURCESDK +everything /mksln _vpc_/ninja/${{ matrix.arch }}
if [ "${{ matrix.arch }}" = "x86" ]; then
sed -i 's/i386-linux/i686-linux/g' _vpc_/ninja/${{ matrix.arch }}.ninja
fi

- name: Build
working-directory: ${{ github.workspace }}/src
run: ninja -f "_vpc_/ninja/x64.ninja" -j$(nproc)
run: ninja -f "_vpc_/ninja/${{ matrix.arch }}.ninja" -j$(nproc)
2 changes: 0 additions & 2 deletions src/game/client/jbmod/c_jbmod_player.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -791,8 +791,6 @@ void C_JBMod_Player::HandleSpeedChanges( CMoveData *mv )
{
int nChangedButtons = mv->m_nButtons ^ mv->m_nOldButtons;

bool bJustPressedSpeed = !!( nChangedButtons & IN_SPEED );

const bool bWantSprint = ( CanSprint() && IsSuitEquipped() && ( mv->m_nButtons & IN_SPEED ) );
const bool bWantsToChangeSprinting = ( m_HL2Local.m_bNewSprinting != bWantSprint ) && ( nChangedButtons & IN_SPEED ) != 0;

Expand Down
4 changes: 2 additions & 2 deletions src/game/server/physics_impact_damage.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -339,7 +339,7 @@ float CalculatePhysicsImpactDamage( int index, gamevcollisionevent_t *pEvent, co
CBasePlayer* pPlayer = NULL;
if ( gpGlobals->maxClients == 1 )
{
CBasePlayer *pPlayer = UTIL_GetLocalPlayer();
pPlayer = UTIL_GetLocalPlayer();
}
else {
for ( int i = 1; i <= gpGlobals->maxClients; i++ )
Expand Down Expand Up @@ -455,7 +455,7 @@ float CalculatePhysicsImpactDamage( int index, gamevcollisionevent_t *pEvent, co
CBasePlayer *pPlayer = NULL;
if ( gpGlobals->maxClients == 1 )
{
CBasePlayer *pPlayer = UTIL_GetLocalPlayer();
pPlayer = UTIL_GetLocalPlayer();
} else {
for (int i = 1; i <= gpGlobals->maxClients; i++)
{
Expand Down
Loading