diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 6da018625..c2a49c464 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -73,6 +73,11 @@ jobs: run: | cmake -G "Visual Studio 16 2019" -A Win32 -B build -DCMAKE_INSTALL_PREFIX="dist" msbuild -verbosity:normal /property:Configuration=Release build/INSTALL.vcxproj + - name: Build on Windows x64 + if: startsWith(matrix.os, 'windows') + run: | + cmake -G "Visual Studio 16 2019" -A x64 -B build64 -DCMAKE_INSTALL_PREFIX="dist64" -D64BIT=ON + msbuild -verbosity:normal /property:Configuration=Release /property:Platform=x64 build64/INSTALL.vcxproj - name: Build on Windows with vgui if: startsWith(matrix.os, 'windows') run: | @@ -105,6 +110,12 @@ jobs: with: name: hlsdk-${{ steps.extract_branch.outputs.branch }}-windows path: dist/${{ steps.extract_gamedir.outputs.gamedir }} + - name: Upload windows x64 artifact + if: startsWith(matrix.os, 'windows') + uses: actions/upload-artifact@v4 + with: + name: hlsdk-${{ steps.extract_branch.outputs.branch }}-windows_x64 + path: dist64/${{ steps.extract_gamedir.outputs.gamedir }} - name: Upload windows artifact with vgui if: startsWith(matrix.os, 'windows') uses: actions/upload-artifact@v4 diff --git a/dlls/func_break.cpp b/dlls/func_break.cpp index 48f477821..cd7adfba3 100644 --- a/dlls/func_break.cpp +++ b/dlls/func_break.cpp @@ -1025,7 +1025,6 @@ void CPushable::Move( CBaseEntity *pOther, int push ) { if( push ) { - factor = 0.25f; pev->velocity.x += pevToucher->velocity.x * factor; pev->velocity.y += pevToucher->velocity.y * factor; } diff --git a/dlls/nodes.cpp b/dlls/nodes.cpp index 28fc7144f..74565ebaa 100644 --- a/dlls/nodes.cpp +++ b/dlls/nodes.cpp @@ -2475,7 +2475,10 @@ int CGraph::FLoadGraph( const char *szMapName ) length -= sizeof(CLink_Retail) * m_cLinks; if( length < 0 ) goto ShortFile; - reinterpret_cast(pMemFile) -> copyOverTo(m_pLinkPool); + for (int j = 0; j < m_cLinks; ++j) + { + reinterpret_cast(pMemFile + sizeof(CLink_Retail) * j) -> copyOverTo(m_pLinkPool + j); + } pMemFile += sizeof(CLink_Retail) * m_cLinks; } #endif