diff --git a/help_variables.json b/help_variables.json index 490ac0f84..81616f56f 100644 --- a/help_variables.json +++ b/help_variables.json @@ -16108,15 +16108,27 @@ } ] }, - "r_sgbloodColor": { - "default": "73", - "desc": "Determines the (palletized) color of the blood particles emitted when hitting entities with weapons other than the lightning gun.", + "r_lgbloodColor": { + "default": "225", + "desc": "Determines the (palletized) color of the blood particles emitted when hitting entities with the lightning gun.", "group-id": "8", "type": "integer" }, - "r_lgbloodColor": { + "r_rlbloodColor_small": { "default": "225", - "desc": "Determines the (palletized) color of the blood particles emitted when hitting entities with the lightning gun.", + "desc": "Determines the (palletized) color of the blood particles emitted when hitting entities with the rocket launcher. Requires the rocket explosion to be small blood (cl_explosiontype 3. Default value is 225.", + "group-id": "8", + "type": "integer" + }, + "r_rlbloodColor_big": { + "default": "73", + "desc": "Determines the (palletized) color of the blood particles emitted when hitting entities with the rocket launcher. Requires the rocket explosion to be big blood (cl_explosiontype 4. Default value is 73.", + "group-id": "8", + "type": "integer" + }, + "r_sgbloodColor": { + "default": "73", + "desc": "Determines the (palletized) color of the blood particles emitted when hitting entities with weapons other than the lightning gun.", "group-id": "8", "type": "integer" }, diff --git a/src/cl_tent.c b/src/cl_tent.c index 34d794559..4e8c3dc91 100644 --- a/src/cl_tent.c +++ b/src/cl_tent.c @@ -65,8 +65,10 @@ static model_t *cl_explo_mod, *cl_bolt1_mod, *cl_bolt2_mod, *cl_bolt3_mod, *cl_b sfx_t *cl_sfx_wizhit, *cl_sfx_knighthit, *cl_sfx_tink1, *cl_sfx_ric1, *cl_sfx_ric2, *cl_sfx_ric3, *cl_sfx_r_exp3; -cvar_t r_sgbloodColor = {"r_sgbloodColor", "73"}; cvar_t r_lgbloodColor = {"r_lgbloodColor", "225"}; +cvar_t r_rlbloodColor_small = {"r_rlbloodColor_small", "225"}; +cvar_t r_rlbloodColor_big = {"r_rlbloodColor_big", "73"}; +cvar_t r_sgbloodColor = {"r_sgbloodColor", "73"}; cvar_t r_shiftbeam = {"r_shiftbeam", "0"}; void CL_InitTEnts(void) @@ -83,8 +85,10 @@ void CL_InitTEnts(void) void CL_InitTEntsCvar(void) { Cvar_SetCurrentGroup(CVAR_GROUP_EYECANDY); - Cvar_Register(&r_sgbloodColor); Cvar_Register(&r_lgbloodColor); + Cvar_Register(&r_rlbloodColor_small); + Cvar_Register(&r_rlbloodColor_big); + Cvar_Register(&r_sgbloodColor); Cvar_Register(&r_shiftbeam); Cvar_ResetCurrentGroup(); } @@ -428,11 +432,11 @@ static void CL_Parse_TE_EXPLOSION(vec3_t pos) } else if (r_explosiontype.value == 3) { // lightning blood - R_RunParticleEffect(pos, vec3_origin, 225, 50); + R_RunParticleEffect(pos, vec3_origin, r_rlbloodColor_small.value ? r_rlbloodColor_small.integer : 225, 50); } else if (r_explosiontype.value == 4) { // Big blood - R_RunParticleEffect(pos, vec3_origin, 73, 20 * 32); + R_RunParticleEffect(pos, vec3_origin, r_rlbloodColor_big.value ? r_rlbloodColor_big.integer : 73, 20 * 32); } else if (r_explosiontype.value == 5) { // Double gunshot