YGGverse/hlsdk-portable
1
0
Fork 0
mirror of https://github.com/YGGverse/hlsdk-portable.git synced 2025-01-27 07:04:16 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into mobile_hacks

Browse Source
This commit is contained in:
Andrey Akhmichin 2021-06-05 20:57:33 +05:00
commit 60911067ca
5 changed files with 29 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
cl_dll/ev_hldm.cpp
View File

@ -1373,7 +1373,7 @@ void EV_FireRpg( event_args_t *args )
//====================== //======================
//====================== //======================
// EGON END // EGON START
//====================== //======================
enum egon_e enum egon_e
{ {
@ -1502,10 +1502,11 @@ void EV_EgonFire( event_args_t *args )
float g = 50.0f; float g = 50.0f;
float b = 125.0f; float b = 125.0f;
if( IEngineStudio.IsHardware() ) // if( IEngineStudio.IsHardware() )
{ {
r /= 100.0f; r /= 255.0f;
g /= 100.0f; g /= 255.0f;
b /= 255.0f;
} }
pBeam = gEngfuncs.pEfxAPI->R_BeamEntPoint( idx | 0x1000, tr.endpos, iBeamModelIndex, 99999, 3.5, 0.2, 0.7, 55, 0, 0, r, g, b ); pBeam = gEngfuncs.pEfxAPI->R_BeamEntPoint( idx | 0x1000, tr.endpos, iBeamModelIndex, 99999, 3.5, 0.2, 0.7, 55, 0, 0, r, g, b );

2
dlls/game.cpp
View File

@ -35,7 +35,7 @@ cvar_t weaponstay = { "mp_weaponstay","0", FCVAR_SERVER };
cvar_t selfgauss = { "selfgauss", "1", FCVAR_SERVER }; cvar_t selfgauss = { "selfgauss", "1", FCVAR_SERVER };
cvar_t chargerfix = { "chargerfix", "0", FCVAR_SERVER }; cvar_t chargerfix = { "chargerfix", "0", FCVAR_SERVER };
cvar_t satchelfix = { "satchelfix", "0", FCVAR_SERVER }; cvar_t satchelfix = { "satchelfix", "0", FCVAR_SERVER };
cvar_t monsteryawspeedfix = { "monsteryawspeedfix", "0", FCVAR_SERVER }; cvar_t monsteryawspeedfix = { "monsteryawspeedfix", "1", FCVAR_SERVER };
cvar_t forcerespawn = { "mp_forcerespawn","1", FCVAR_SERVER }; cvar_t forcerespawn = { "mp_forcerespawn","1", FCVAR_SERVER };
cvar_t flashlight = { "mp_flashlight","0", FCVAR_SERVER }; cvar_t flashlight = { "mp_flashlight","0", FCVAR_SERVER };
cvar_t aimcrosshair = { "mp_autocrosshair","1", FCVAR_SERVER }; cvar_t aimcrosshair = { "mp_autocrosshair","1", FCVAR_SERVER };

3
dlls/player.cpp
View File

@ -1198,6 +1198,8 @@ void CBasePlayer::WaterMove()
} }
// make bubbles // make bubbles
if( pev->waterlevel == 3 )
{
air = (int)( pev->air_finished - gpGlobals->time ); air = (int)( pev->air_finished - gpGlobals->time );
if( !RANDOM_LONG( 0, 0x1f ) && RANDOM_LONG( 0, AIRTIME - 1 ) >= air ) if( !RANDOM_LONG( 0, 0x1f ) && RANDOM_LONG( 0, AIRTIME - 1 ) >= air )
{ {
@ -1217,6 +1219,7 @@ void CBasePlayer::WaterMove()
break; break;
} }
} }
}
if( pev->watertype == CONTENT_LAVA ) // do damage if( pev->watertype == CONTENT_LAVA ) // do damage
{ {

3
dlls/scientist.cpp
View File

@ -792,6 +792,9 @@ int CScientist::ISoundMask( void )
{ {
return bits_SOUND_WORLD | return bits_SOUND_WORLD |
bits_SOUND_COMBAT | bits_SOUND_COMBAT |
bits_SOUND_CARCASS |
bits_SOUND_MEAT |
bits_SOUND_GARBAGE |
bits_SOUND_DANGER | bits_SOUND_DANGER |
bits_SOUND_PLAYER; bits_SOUND_PLAYER;
} }

4
dlls/triggers.cpp
View File

@ -2345,8 +2345,8 @@ void CTriggerCamera::FollowTarget()
if( dy > 180 ) if( dy > 180 )
dy = dy - 360; dy = dy - 360;
pev->avelocity.x = dx * 40 * gpGlobals->frametime; pev->avelocity.x = dx * 40 * 0.01f;
pev->avelocity.y = dy * 40 * gpGlobals->frametime; pev->avelocity.y = dy * 40 * 0.01f;
if( !( FBitSet( pev->spawnflags, SF_CAMERA_PLAYER_TAKECONTROL ) ) ) if( !( FBitSet( pev->spawnflags, SF_CAMERA_PLAYER_TAKECONTROL ) ) )
{ {