FWGS
/
hlsdk-xash3d
mirror of https://github.com/FWGS/hlsdk-xash3d
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into opfor

This commit is contained in:
Andrey Akhmichin 2022-06-07 00:01:03 +05:00
parent 6c40b4d329 ab38461c33
commit be0a35053a
No known key found for this signature in database
GPG Key ID: 1F180D249B0643C0
5 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
dlls/combat.cpp
View File

@ -29,6 +29,7 @@
#include "animation.h"
#include "weapons.h"
#include "func_break.h"
#include "game.h"
extern DLL_GLOBAL Vector g_vecAttackDir;
extern DLL_GLOBAL int g_iSkillLevel;
@ -513,10 +514,16 @@ void CBaseMonster::BecomeDead( void )
// make the corpse fly away from the attack vector
pev->movetype = MOVETYPE_TOSS;
//pev->flags &= ~FL_ONGROUND;
//pev->origin.z += 2.0f;
//pev->velocity = g_vecAttackDir * -1.0f;
//pev->velocity = pev->velocity * RANDOM_FLOAT( 300.0f, 400.0f );
if (corpsephysics.value &&
// affect only dying monsters, not initially dead ones
m_IdealMonsterState == MONSTERSTATE_DEAD)
{
pev->flags &= ~FL_ONGROUND;
pev->origin.z += 2.0f;
pev->velocity = g_vecAttackDir * -1.0f;
pev->velocity = pev->velocity * RANDOM_FLOAT( 300.0f, 400.0f );
}
}
BOOL CBaseMonster::ShouldGibMonster( int iGib )

2
dlls/game.cpp
View File

@ -37,6 +37,7 @@ cvar_t chargerfix = { "chargerfix", "0", FCVAR_SERVER };
cvar_t satchelfix = { "satchelfix", "0", FCVAR_SERVER };
cvar_t explosionfix = { "explosionfix", "0", FCVAR_SERVER };
cvar_t monsteryawspeedfix = { "monsteryawspeedfix", "1", FCVAR_SERVER };
cvar_t corpsephysics = { "corpsephysics", "0", FCVAR_SERVER };
cvar_t forcerespawn = { "mp_forcerespawn","1", FCVAR_SERVER };
cvar_t flashlight = { "mp_flashlight","0", FCVAR_SERVER };
cvar_t aimcrosshair = { "mp_autocrosshair","1", FCVAR_SERVER };
@ -753,6 +754,7 @@ void GameDLLInit( void )
CVAR_REGISTER( &satchelfix );
CVAR_REGISTER( &explosionfix );
CVAR_REGISTER( &monsteryawspeedfix );
CVAR_REGISTER( &corpsephysics );
CVAR_REGISTER( &forcerespawn );
CVAR_REGISTER( &flashlight );
CVAR_REGISTER( &aimcrosshair );

1
dlls/game.h
View File

@ -32,6 +32,7 @@ extern cvar_t chargerfix;
extern cvar_t satchelfix;
extern cvar_t explosionfix;
extern cvar_t monsteryawspeedfix;
extern cvar_t corpsephysics;
extern cvar_t forcerespawn;
extern cvar_t flashlight;
extern cvar_t aimcrosshair;

2
dlls/gauss.cpp
View File

@ -391,7 +391,7 @@ void CGauss::Fire( Vector vecOrigSrc, Vector vecDir, float flDamage )
// It's delayed by a fraction of second to make sure it is delayed by 1 frame on the client
// It's sent reliably anyway, which could lead to other delays
PLAYBACK_EVENT_FULL( FEV_NOTHOST | FEV_RELIABLE, m_pPlayer->edict(), m_usGaussFire, 0.01f, m_pPlayer->pev->origin, m_pPlayer->pev->angles, 0.0, 0.0, 0, 0, 0, 1 );
PLAYBACK_EVENT_FULL( FEV_NOTHOST | FEV_RELIABLE | FEV_GLOBAL, m_pPlayer->edict(), m_usGaussFire, 0.01f, m_pPlayer->pev->origin, m_pPlayer->pev->angles, 0.0, 0.0, 0, 0, 0, 1 );
/*ALERT( at_console, "%f %f %f\n%f %f %f\n",
vecSrc.x, vecSrc.y, vecSrc.z,

4
dlls/osprey.cpp
View File

@ -689,7 +689,7 @@ void COsprey::TraceAttack( entvars_t *pevAttacker, float flDamage, Vector vecDir
return;
else
m_flRightHealth -= flDamage;
m_iDoLeftSmokePuff = 3 + ( flDamage / 5.0f );
m_iDoRightSmokePuff = 3 + ( flDamage / 5.0f );
}
if( ptr->iHitgroup == 2 )
@ -698,7 +698,7 @@ void COsprey::TraceAttack( entvars_t *pevAttacker, float flDamage, Vector vecDir
return;
else
m_flLeftHealth -= flDamage;
m_iDoRightSmokePuff = 3 + ( flDamage / 5.0f );
m_iDoLeftSmokePuff = 3 + ( flDamage / 5.0f );
}
// hit hard, hits cockpit, hits engines