Browse Source

Merge branch 'master' into bshift

bshift
Andrey Akhmichin 4 years ago
parent
commit
8f8cf54d10
  1. 9
      cl_dll/ev_hldm.cpp
  2. 2
      dlls/game.cpp
  3. 33
      dlls/player.cpp
  4. 3
      dlls/scientist.cpp
  5. 4
      dlls/triggers.cpp

9
cl_dll/ev_hldm.cpp

@ -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

@ -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 };

33
dlls/player.cpp

@ -1198,23 +1198,26 @@ void CBasePlayer::WaterMove()
} }
// make bubbles // make bubbles
air = (int)( pev->air_finished - gpGlobals->time ); if( pev->waterlevel == 3 )
if( !RANDOM_LONG( 0, 0x1f ) && RANDOM_LONG( 0, AIRTIME - 1 ) >= air )
{ {
switch( RANDOM_LONG( 0, 3 ) ) air = (int)( pev->air_finished - gpGlobals->time );
if( !RANDOM_LONG( 0, 0x1f ) && RANDOM_LONG( 0, AIRTIME - 1 ) >= air )
{ {
case 0: switch( RANDOM_LONG( 0, 3 ) )
EMIT_SOUND( ENT( pev ), CHAN_BODY, "player/pl_swim1.wav", 0.8, ATTN_NORM ); {
break; case 0:
case 1: EMIT_SOUND( ENT( pev ), CHAN_BODY, "player/pl_swim1.wav", 0.8, ATTN_NORM );
EMIT_SOUND( ENT( pev ), CHAN_BODY, "player/pl_swim2.wav", 0.8, ATTN_NORM ); break;
break; case 1:
case 2: EMIT_SOUND( ENT( pev ), CHAN_BODY, "player/pl_swim2.wav", 0.8, ATTN_NORM );
EMIT_SOUND( ENT( pev ), CHAN_BODY, "player/pl_swim3.wav", 0.8, ATTN_NORM ); break;
break; case 2:
case 3: EMIT_SOUND( ENT( pev ), CHAN_BODY, "player/pl_swim3.wav", 0.8, ATTN_NORM );
EMIT_SOUND( ENT( pev ), CHAN_BODY, "player/pl_swim4.wav", 0.8, ATTN_NORM ); break;
break; case 3:
EMIT_SOUND( ENT( pev ), CHAN_BODY, "player/pl_swim4.wav", 0.8, ATTN_NORM );
break;
}
} }
} }

3
dlls/scientist.cpp

@ -825,6 +825,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

@ -2338,8 +2338,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 ) ) )
{ {

Loading…
Cancel
Save