[jaPRO/1flagctf] Make the neutralflag green (#203)

taysta · May 15, 2024 · 7bf6b93 · 7bf6b93
1 parent 1635da6
commit 7bf6b93
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 1 deletion.
diff --git a/assets/japro/models/flags/n_flag.md3 b/assets/japro/models/flags/n_flag.md3
diff --git a/assets/japro/models/map_objects/mp/flan.jpg b/assets/japro/models/map_objects/mp/flan.jpg
diff --git 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
+    }
 }
diff --git 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