YGGverse
/
hlsdk-portable
mirror of https://github.com/YGGverse/hlsdk-portable.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Merge branch 'master' into mobile_hacks

mobile_hacks
Alibek Omarov 3 years ago
parent
eadade7157 215ac04f70
commit
090c3d628d
7 changed files with 38 additions and 75 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 51
      cl_dll/ev_hldm.cpp
  2. 2
      dlls/func_break.cpp
  3. 2
      dlls/h_battery.cpp
  4. 2
      dlls/healthkit.cpp
  5. 2
      dlls/pathcorner.cpp
  6. 2
      dlls/sound.cpp
  7. 50
      scripts/waifulib/xcompile.py

51
cl_dll/ev_hldm.cpp
Unescape View File

@ -458,7 +458,8 @@ void EV_HLDM_FireBullets( int idx, float *forward, float *right, float *up, int
//====================== //======================
// GLOCK START // GLOCK START
//====================== //======================
void EV_FireGlock1( event_args_t *args ) // Shared Glock fire implementation for EV_FireGlock1 and EV_FireGlock2.
static void EV_FireGlock_Impl( event_args_t *args )
{ {
int idx; int idx;
vec3_t origin; vec3_t origin;
@ -503,50 +504,14 @@ void EV_FireGlock1( event_args_t *args )
EV_HLDM_FireBullets( idx, forward, right, up, 1, vecSrc, vecAiming, 8192, BULLET_PLAYER_9MM, 0, &g_tracerCount[idx - 1], args->fparam1, args->fparam2 ); EV_HLDM_FireBullets( idx, forward, right, up, 1, vecSrc, vecAiming, 8192, BULLET_PLAYER_9MM, 0, &g_tracerCount[idx - 1], args->fparam1, args->fparam2 );
} }
void EV_FireGlock2( event_args_t *args ) void EV_FireGlock1( event_args_t *args )
{ {
int idx; EV_FireGlock_Impl( args );
vec3_t origin; }
vec3_t angles;
vec3_t velocity;
vec3_t ShellVelocity;
vec3_t ShellOrigin;
int shell;
vec3_t vecSrc, vecAiming;
//vec3_t vecSpread;
vec3_t up, right, forward;
idx = args->entindex;
VectorCopy( args->origin, origin );
VectorCopy( args->angles, angles );
VectorCopy( args->velocity, velocity );
int empty = args->bparam1;
AngleVectors( angles, forward, right, up );
shell = gEngfuncs.pEventAPI->EV_FindModelIndex( "models/shell.mdl" );// brass shell
if( EV_IsLocal( idx ) )
{
// Add muzzle flash to current weapon model
EV_MuzzleFlash();
gEngfuncs.pEventAPI->EV_WeaponAnimation( empty ? GLOCK_SHOOT_EMPTY : GLOCK_SHOOT, 2 );
V_PunchAxis( 0, -2.0 );
}
EV_GetDefaultShellInfo( args, origin, velocity, ShellVelocity, ShellOrigin, forward, right, up, 20, -12, 4 );
EV_EjectBrass ( ShellOrigin, ShellVelocity, angles[YAW], shell, TE_BOUNCE_SHELL );
gEngfuncs.pEventAPI->EV_PlaySound( idx, origin, CHAN_WEAPON, "weapons/pl_gun3.wav", gEngfuncs.pfnRandomFloat( 0.92, 1.0 ), ATTN_NORM, 0, 98 + gEngfuncs.pfnRandomLong( 0, 3 ) );
EV_GetGunPosition( args, vecSrc, origin );
VectorCopy( forward, vecAiming );
EV_HLDM_FireBullets( idx, forward, right, up, 1, vecSrc, vecAiming, 8192, BULLET_PLAYER_9MM, 0, &g_tracerCount[idx - 1], args->fparam1, args->fparam2 ); void EV_FireGlock2( event_args_t *args )
{
EV_FireGlock_Impl( args );
} }
//====================== //======================
// GLOCK END // GLOCK END

2
dlls/func_break.cpp
Unescape View File

@ -139,7 +139,7 @@ TYPEDESCRIPTION CBreakable::m_SaveData[] =
// Explosion magnitude is stored in pev->impulse // Explosion magnitude is stored in pev->impulse
}; };
IMPLEMENT_SAVERESTORE( CBreakable, CBaseEntity ) IMPLEMENT_SAVERESTORE( CBreakable, CBaseDelay )
void CBreakable::Spawn( void ) void CBreakable::Spawn( void )
{ {

2
dlls/h_battery.cpp
Unescape View File

@ -66,7 +66,7 @@ TYPEDESCRIPTION CRecharge::m_SaveData[] =
#endif // MOBILE_HACKS #endif // MOBILE_HACKS
}; };
IMPLEMENT_SAVERESTORE( CRecharge, CBaseEntity ) IMPLEMENT_SAVERESTORE( CRecharge, CBaseToggle )
LINK_ENTITY_TO_CLASS( func_recharge, CRecharge ) LINK_ENTITY_TO_CLASS( func_recharge, CRecharge )

2
dlls/healthkit.cpp
Unescape View File

@ -133,7 +133,7 @@ TYPEDESCRIPTION CWallHealth::m_SaveData[] =
#endif // MOBILE_HACKS #endif // MOBILE_HACKS
}; };
IMPLEMENT_SAVERESTORE( CWallHealth, CBaseEntity ) IMPLEMENT_SAVERESTORE( CWallHealth, CBaseToggle )
LINK_ENTITY_TO_CLASS( func_healthcharger, CWallHealth ) LINK_ENTITY_TO_CLASS( func_healthcharger, CWallHealth )

2
dlls/pathcorner.cpp
Unescape View File

@ -125,7 +125,7 @@ TYPEDESCRIPTION CPathTrack::m_SaveData[] =
DEFINE_FIELD( CPathTrack, m_altName, FIELD_STRING ), DEFINE_FIELD( CPathTrack, m_altName, FIELD_STRING ),
}; };
IMPLEMENT_SAVERESTORE( CPathTrack, CBaseEntity ) IMPLEMENT_SAVERESTORE( CPathTrack, CPointEntity )
LINK_ENTITY_TO_CLASS( path_track, CPathTrack ) LINK_ENTITY_TO_CLASS( path_track, CPathTrack )
// //

2
dlls/sound.cpp
Unescape View File

@ -825,7 +825,7 @@ TYPEDESCRIPTION CEnvSound::m_SaveData[] =
DEFINE_FIELD( CEnvSound, m_flRoomtype, FIELD_FLOAT ), DEFINE_FIELD( CEnvSound, m_flRoomtype, FIELD_FLOAT ),
}; };
IMPLEMENT_SAVERESTORE( CEnvSound, CBaseEntity ) IMPLEMENT_SAVERESTORE( CEnvSound, CPointEntity )
void CEnvSound::KeyValue( KeyValueData *pkvd ) void CEnvSound::KeyValue( KeyValueData *pkvd )
{ {

50
scripts/waifulib/xcompile.py
Unescape View File

@ -26,6 +26,8 @@ ANDROID_NDK_GCC_MAX = 17 # latest NDK that ships with GCC
ANDROID_NDK_UNIFIED_SYSROOT_MIN = 15 ANDROID_NDK_UNIFIED_SYSROOT_MIN = 15
ANDROID_NDK_SYSROOT_FLAG_MAX = 19 # latest NDK that need --sysroot flag ANDROID_NDK_SYSROOT_FLAG_MAX = 19 # latest NDK that need --sysroot flag
ANDROID_NDK_API_MIN = { 10: 3, 19: 16, 20: 16, 23: 16 } # minimal API level ndk revision supports ANDROID_NDK_API_MIN = { 10: 3, 19: 16, 20: 16, 23: 16 } # minimal API level ndk revision supports
ANDROID_STPCPY_API_MIN = 21 # stpcpy() introduced in SDK 21
ANDROID_64BIT_API_MIN = 21 # minimal API level that supports 64-bit targets ANDROID_64BIT_API_MIN = 21 # minimal API level that supports 64-bit targets
# This class does support ONLY r10e and r19c/r20 NDK # This class does support ONLY r10e and r19c/r20 NDK
@ -266,13 +268,28 @@ class Android:
'-isystem', '%s/usr/include/' % (self.sysroot()) '-isystem', '%s/usr/include/' % (self.sysroot())
] ]
cflags += ['-I%s' % (self.system_stl()), '-DANDROID', '-D__ANDROID__'] cflags += ['-I%s' % (self.system_stl())]
if not self.is_clang():
cflags += ['-DANDROID', '-D__ANDROID__']
if cxx and not self.is_clang() and self.toolchain not in ['4.8','4.9']: if cxx and not self.is_clang() and self.toolchain not in ['4.8','4.9']:
cflags += ['-fno-sized-deallocation'] cflags += ['-fno-sized-deallocation']
def fixup_host_clang_with_old_ndk(): if self.is_clang():
cflags = [] # stpcpy() isn't available in early Android versions
# disable it here so Clang won't use it
if self.api < ANDROID_STPCPY_API_MIN:
cflags += ['-fno-builtin-stpcpy']
if self.is_arm():
if self.arch == 'armeabi-v7a':
# ARMv7 support
cflags += ['-mthumb', '-mfpu=neon', '-mcpu=cortex-a9']
if self.is_hardfp():
cflags += ['-D_NDK_MATH_NO_SOFTFP=1', '-mfloat-abi=hard', '-DLOAD_HARDFP', '-DSOFTFP_LINK']
if self.is_host():
# Clang builtin redefine w/ different calling convention bug # Clang builtin redefine w/ different calling convention bug
# NOTE: I did not added complex.h functions here, despite # NOTE: I did not added complex.h functions here, despite
# that NDK devs forgot to put __NDK_FPABI_MATH__ for complex # that NDK devs forgot to put __NDK_FPABI_MATH__ for complex
@ -281,32 +298,13 @@ class Android:
# just run sed to patch header # just run sed to patch header
for f in ['strtod', 'strtof', 'strtold']: for f in ['strtod', 'strtof', 'strtold']:
cflags += ['-fno-builtin-%s' % f] cflags += ['-fno-builtin-%s' % f]
return cflags
if self.is_arm():
if self.arch == 'armeabi-v7a':
# ARMv7 support
cflags += ['-mthumb', '-mfpu=neon', '-mcpu=cortex-a9', '-DHAVE_EFFICIENT_UNALIGNED_ACCESS', '-DVECTORIZE_SINCOS']
if not self.is_clang() and not self.is_host():
cflags += [ '-mvectorize-with-neon-quad' ]
if self.is_host() and self.ndk_rev <= ANDROID_NDK_HARDFP_MAX:
cflags += fixup_host_clang_with_old_ndk()
if self.is_hardfp():
cflags += ['-D_NDK_MATH_NO_SOFTFP=1', '-mfloat-abi=hard', '-DLOAD_HARDFP', '-DSOFTFP_LINK']
else: else:
cflags += ['-mfloat-abi=softfp'] cflags += ['-mfloat-abi=softfp']
else: else:
if self.is_host() and self.ndk_rev <= ANDROID_NDK_HARDFP_MAX:
cflags += fixup_host_clang_with_old_ndk()
# ARMv5 support # ARMv5 support
cflags += ['-march=armv5te', '-msoft-float'] cflags += ['-march=armv5te', '-msoft-float']
elif self.is_x86(): elif self.is_x86():
cflags += ['-mtune=atom', '-march=atom', '-mssse3', '-mfpmath=sse', '-DVECTORIZE_SINCOS', '-DHAVE_EFFICIENT_UNALIGNED_ACCESS'] cflags += ['-mtune=atom', '-march=atom', '-mssse3', '-mfpmath=sse']
return cflags return cflags
# they go before object list # they go before object list
@ -322,8 +320,9 @@ class Android:
if self.is_clang() or self.is_host(): if self.is_clang() or self.is_host():
linkflags += ['-fuse-ld=lld'] linkflags += ['-fuse-ld=lld']
else: linkflags += ['-no-canonical-prefixes']
linkflags += ['-Wl,--hash-style=sysv', '-Wl,--no-undefined', '-no-canonical-prefixes'] linkflags += ['-Wl,--hash-style=sysv', '-Wl,--no-undefined']
return linkflags return linkflags
def ldflags(self): def ldflags(self):
@ -332,10 +331,9 @@ class Android:
if self.ndk_rev < 23: if self.ndk_rev < 23:
ldflags += ['-lgcc'] ldflags += ['-lgcc']
ldflags += ['-no-canonical-prefixes']
if self.is_clang() or self.is_host(): if self.is_clang() or self.is_host():
ldflags += ['-stdlib=libstdc++'] ldflags += ['-stdlib=libstdc++']
else: ldflags += ['-no-canonical-prefixes']
if self.is_arm(): if self.is_arm():
if self.arch == 'armeabi-v7a': if self.arch == 'armeabi-v7a':

Write Preview
Loading…
Cancel
Save