H3cJP/source-engine
1
0
Fork 0
mirror of https://github.com/nillerusr/source-engine.git synced 2026-07-16 06:19:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix(CI): Install 64bit deps for linux.

Browse Source 
fix(FunctionCheck): Should not fail anymore.
fix(triggers): cast to intp.
fix(AI_ResponseSystem): Fix ResponseSystemCompare cast.

Untested.
This commit is contained in:
tupoy-ya 2024-12-30 21:04:03 +05:00
parent dba14e2dc1
commit 4d49e1eb12
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.github/workflows/build.yml vendored
View File

@ -2,7 +2,7 @@ name: Build
on: [push, pull_request] on: [push, pull_request]
env: env:
WAF_FLAGS: -T debug --disable-warns --prefix=build_hl2 WAF_FLAGS: -T release --disable-warns --prefix=build_hl2
jobs: jobs:
build-linux: build-linux:
@ -29,7 +29,7 @@ jobs:
- name: Install common dependencies - name: Install common dependencies
run: sudo apt-get update && sudo apt-get install -y g++-multilib gcc-multilib run: sudo apt-get update && sudo apt-get install -y g++-multilib gcc-multilib
- name: Install 32bit dependencies - name: Install 32bit dependencies
if: ${{ matrix.bits == '' && !matrix.android }} if: ${{ matrix.bits != '' && !matrix.android }}
run: | run: |
sudo dpkg --add-architecture i386 sudo dpkg --add-architecture i386
sudo apt-get update sudo apt-get update
@ -41,7 +41,7 @@ jobs:
run: | run: |
sudo apt-get install -y $DEPS sudo apt-get install -y $DEPS
- name: Install Android dependencies - name: Install Android dependencies
if: ${{ matrix.android != '' }} if: ${{ matrix.android == '' }}
run: | run: |
wget https://dl.google.com/android/repository/android-ndk-r10e-linux-x86_64.zip -o /dev/null wget https://dl.google.com/android/repository/android-ndk-r10e-linux-x86_64.zip -o /dev/null
unzip android-ndk-r10e-linux-x86_64.zip unzip android-ndk-r10e-linux-x86_64.zip

2
game/server/AI_ResponseSystem.cpp
View File

@ -3054,7 +3054,7 @@ CON_COMMAND( rr_reloadresponsesystems, "Reload all response system scripts." )
bool ResponseSystemCompare( const char *criterion, const char *value ) bool ResponseSystemCompare( const char *criterion, const char *value )
{ {
Criteria criteria; Criteria criteria;
criteria.value = criterion; criteria.value = (char *)criterion;
defaultresponsesytem.ComputeMatcher( &criteria, criteria.matcher ); defaultresponsesytem.ComputeMatcher( &criteria, criteria.matcher );
return defaultresponsesytem.CompareUsingMatcher( value, criteria.matcher, true ); return defaultresponsesytem.CompareUsingMatcher( value, criteria.matcher, true );

2
game/server/baseentity.h
View File

@ -2960,7 +2960,7 @@ inline const char* CBaseEntity::ScriptGetModelName(void) const
do \ do \
{ \ { \
m_pfnMoveDone = static_cast <void (CBaseEntity::*)(void)> (a); \ m_pfnMoveDone = static_cast <void (CBaseEntity::*)(void)> (a); \
FunctionCheck( * (inputfunc_t *)(((char *)this + ( offsetof(CBaseEntity,m_pfnMoveDone)))), "BaseMoveFunc" ); \ FunctionCheck( (void *)*((int *)((char *)this + ( offsetof(CBaseEntity,m_pfnMoveDone)))), "BaseMoveFunc" );
} while ( 0 ) } while ( 0 )
#else #else
#define SetMoveDone( a ) \ #define SetMoveDone( a ) \

2
game/server/triggers.cpp
View File

@ -4235,7 +4235,7 @@ public:
return IMotionEvent::SIM_NOTHING; return IMotionEvent::SIM_NOTHING;
// Get a cosine modulated noise between 5 and 20 that is object specific // Get a cosine modulated noise between 5 and 20 that is object specific
int nNoiseMod = 5+(int)pObject%15; // int nNoiseMod = 5+(intp)pObject%15; //
// Turn wind yaw direction into a vector and add noise // Turn wind yaw direction into a vector and add noise
QAngle vWindAngle = vec3_angle; QAngle vWindAngle = vec3_angle;