From 5cdeb7ac88a3d3ffc13ce69462ca63556bb6517b Mon Sep 17 00:00:00 2001 From: Bucky21659 Date: Tue, 19 Sep 2017 12:10:42 -0600 Subject: [PATCH 1/3] Fix sound kick from body disentegration effect. --- cgame/cg_ents.cpp | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/cgame/cg_ents.cpp b/cgame/cg_ents.cpp index cbbe6aca..c93ebb88 100644 --- a/cgame/cg_ents.cpp +++ b/cgame/cg_ents.cpp @@ -1309,8 +1309,12 @@ static void CG_General( centity_t *cent ) { if ( curTimeDif < 3400 ) { if ( lightSide ) { - if ( curTimeDif < 2200 ) { //probably temporary - trap->S_StartSound( NULL, cent->currentState.number, CHAN_AUTO, trap->S_RegisterSound( "sound/weapons/saber/saberhum1.wav" ) ); + if ( curTimeDif < 2200 + && cg.frametime > 0 + && ((cg.frametime < 50 && cg.time % 50 <= cg.frametime) + || cg.frametime >= 50)) //probably temporary + { + trap->S_StartSound(NULL, cent->currentState.number, CHAN_AUTO, trap->S_RegisterSound("sound/weapons/saber/saberhum1.wav")); } } else { //probably temporary as well @@ -1324,7 +1328,11 @@ static void CG_General( centity_t *cent ) { else { ent.customShader = media.gfx.world.electricBody2; } - if ( random() > 0.9f ) { + if (( random() > 0.9f ) + && cg.frametime > 0 + && ((cg.frametime < 50 && cg.time % 50 <= cg.frametime) + || cg.frametime >=50)) + { trap->S_StartSound( NULL, cent->currentState.number, CHAN_AUTO, media.sounds.environment.crackle ); } SE_R_AddRefEntityToScene( &ent, cent->currentState.number ); From b22e943c286db4ab92ca6cfed64856f9dad5c25b Mon Sep 17 00:00:00 2001 From: Bucky21659 Date: Tue, 19 Sep 2017 15:23:28 -0600 Subject: [PATCH 2/3] Fixed radar arrow for TFFA. --- cgame/cg_media.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cgame/cg_media.cpp b/cgame/cg_media.cpp index 73957c24..cda030b0 100644 --- a/cgame/cg_media.cpp +++ b/cgame/cg_media.cpp @@ -273,7 +273,7 @@ static const resource_t gfx[] = { { &media.gfx.interface.automap.frameLeft, "gfx/mp_automap/mpauto_frame_left", RFL_NOMIP, GTB_SIEGE }, { &media.gfx.interface.automap.frameRight, "gfx/mp_automap/mpauto_frame_right", RFL_NOMIP, GTB_SIEGE }, { &media.gfx.interface.automap.frameTop, "gfx/mp_automap/mpauto_frame_top", RFL_NOMIP, GTB_SIEGE }, - { &media.gfx.interface.automap.playerIcon, "gfx/menus/radar/arrow_w", RFL_NOMIP, GTB_SIEGE }, + { &media.gfx.interface.automap.playerIcon, "gfx/menus/radar/arrow_w", RFL_NOMIP, GTB_ALL&~GTB_NOTTEAM }, { &media.gfx.interface.automap.rocketIcon, "gfx/menus/radar/rocket", RFL_NOMIP, GTB_SIEGE }, { &media.gfx.interface.binoculars.arrow, "gfx/2d/binSideArrow", RFL_NOMIP, GTB_ALL }, { &media.gfx.interface.binoculars.circle, "gfx/2d/binCircle", RFL_NOMIP, GTB_ALL }, From 0072b61faa83f742ed45b160275b9f44cdf1f4d5 Mon Sep 17 00:00:00 2001 From: Bucky21659 Date: Thu, 21 Sep 2017 00:25:02 -0600 Subject: [PATCH 3/3] Fix for radar in vehicles on FFA. Preloads in all gametypes now. --- cgame/cg_media.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cgame/cg_media.cpp b/cgame/cg_media.cpp index cda030b0..565be496 100644 --- a/cgame/cg_media.cpp +++ b/cgame/cg_media.cpp @@ -273,7 +273,7 @@ static const resource_t gfx[] = { { &media.gfx.interface.automap.frameLeft, "gfx/mp_automap/mpauto_frame_left", RFL_NOMIP, GTB_SIEGE }, { &media.gfx.interface.automap.frameRight, "gfx/mp_automap/mpauto_frame_right", RFL_NOMIP, GTB_SIEGE }, { &media.gfx.interface.automap.frameTop, "gfx/mp_automap/mpauto_frame_top", RFL_NOMIP, GTB_SIEGE }, - { &media.gfx.interface.automap.playerIcon, "gfx/menus/radar/arrow_w", RFL_NOMIP, GTB_ALL&~GTB_NOTTEAM }, + { &media.gfx.interface.automap.playerIcon, "gfx/menus/radar/arrow_w", RFL_NOMIP, GTB_ALL }, { &media.gfx.interface.automap.rocketIcon, "gfx/menus/radar/rocket", RFL_NOMIP, GTB_SIEGE }, { &media.gfx.interface.binoculars.arrow, "gfx/2d/binSideArrow", RFL_NOMIP, GTB_ALL }, { &media.gfx.interface.binoculars.circle, "gfx/2d/binCircle", RFL_NOMIP, GTB_ALL },