tech
/
nuclide
2
0
Fork 0
Code Issues 33 Releases Activity

Client: Add cvar: v_muzzledlight

This commit is contained in:
Marco Cawthorne 2022-04-08 14:20:49 -07:00
parent 69b5524771
commit 1dd3fe0eff
Signed by: eukara
GPG Key ID: C196CD8BA993248A
3 changed files with 21 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/client/view.qc
View File

@ -14,7 +14,8 @@
* OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
var int autocvar_v_modellag = 0;
var bool autocvar_v_modellag = 0;
var bool autocvar_v_muzzledlight = 1;
void
View_Init(void)
@ -236,7 +237,8 @@ View_DrawViewModel(void)
m_eMuzzleflash.angles = m_eViewModel.angles;
m_eMuzzleflash.angles[2] += (random() * 10) - 5;
//dynamiclight_add(pSeat->m_vecPredictedOrigin + (v_forward * 32), 400, [1,0.45,0]);
if (autocvar_v_muzzledlight == true)
dynamiclight_add(pSeat->m_vecPredictedOrigin + (v_forward * 32), 400, [1,0.45,0]);
setorigin(m_eMuzzleflash, m_eMuzzleflash.origin);
addentity(m_eMuzzleflash);
@ -247,7 +249,8 @@ View_DrawViewModel(void)
m_eMuzzleflashL.angles = m_eViewModelL.angles;
m_eMuzzleflashL.angles[2] += (random() * 10) - 5;
//dynamiclight_add(pSeat->m_vecPredictedOrigin + (v_forward * 32), 400, [1,0.45,0]);
if (autocvar_v_muzzledlight == true)
dynamiclight_add(pSeat->m_vecPredictedOrigin + (v_forward * 32), 400, [1,0.45,0]);
setorigin(m_eMuzzleflashL, m_eMuzzleflashL.origin);
addentity(m_eMuzzleflashL);

1
src/gs-entbase/server/NSPhysicsEntity.h
View File

@ -44,6 +44,7 @@ class NSPhysicsEntity:NSSurfacePropEntity
virtual void(void) touch;
virtual void(void) TouchThink;
virtual void(void) Pain;
virtual void(void) Death;
virtual void(string, string) SpawnKey;
virtual void(float) SetMass;

16
src/gs-entbase/server/NSPhysicsEntity.qc
View File

@ -255,9 +255,21 @@ NSPhysicsEntity::Pain(void)
if (force > 0.0f)
ApplyForceOffset(v_forward * force, origin - trace_endpos);
if (!HasPropData()) {
health = 100000;
/* if we don't have prop data, don't consider death */
if (HasPropData() == false)
health = 10000;
}
void
NSPhysicsEntity::Death(void)
{
Pain();
super::Death();
if (takedamage != DAMAGE_YES) {
takedamage = (DAMAGE_YES);
}
health = 1000;
}
void