diff --git a/assets/japro/models/flags/n_flag.md3 b/assets/japro/models/flags/n_flag.md3 index 977a291ae8..4371051e07 100644 Binary files a/assets/japro/models/flags/n_flag.md3 and b/assets/japro/models/flags/n_flag.md3 differ diff --git a/assets/japro/models/map_objects/mp/flan.jpg b/assets/japro/models/map_objects/mp/flan.jpg new file mode 100644 index 0000000000..a0bcebd841 Binary files /dev/null and b/assets/japro/models/map_objects/mp/flan.jpg differ diff --git a/assets/japro/shaders/japro.shader b/assets/japro/shaders/japro.shader index 1e080688e3..7e791d540a 100644 --- a/assets/japro/shaders/japro.shader +++ b/assets/japro/shaders/japro.shader @@ -510,4 +510,16 @@ hud/ctf/jpflagtaken clampmap hud/ctf/flagtaken.tga blendFunc blend } +} + +models/map_objects/mp/flan +{ + q3map_nolightmap + q3map_onlyvertexlighting + cull twosided + { + map models/map_objects/mp/flan + blendFunc GL_ONE GL_ZERO + rgbGen lightingDiffuse + } } \ No newline at end of file diff --git a/codemp/cgame/cg_players.c b/codemp/cgame/cg_players.c index e44227dfe3..fa4a1c326a 100644 --- a/codemp/cgame/cg_players.c +++ b/codemp/cgame/cg_players.c @@ -5284,7 +5284,7 @@ static void CG_PlayerPowerups( centity_t *cent, refEntity_t *torso ) { // neutralflag if ( powerups & ( 1 << PW_NEUTRALFLAG ) ) { CG_PlayerFlag( cent, cgs.media.neutralFlagModel );//loda - trap->R_AddLightToScene( cent->lerpOrigin, 200 + (rand()&31), 1.0, 0.2f, 0.2f ); + trap->R_AddLightToScene( cent->lerpOrigin, 200 + (rand()&31), 0.2, 1.0f, 0.2f ); } // haste leaves smoke trails