Add SRGB adjustment to the team colors, make the logic less weird.

Author: The-E

code/def_files/data/effects/main-f.sdr

@@ -293,10 +293,17 @@ void main()
  #ifdef FLAG_TEAMCOLOR
 	vec4 teamMask = vec4(0.0, 0.0, 0.0, 0.0);
 	teamMask = texture(sMiscmap, vec3(texCoord, float(sMiscmapIndex)));
-	vec3 base = max(base_color - vec3(0.5), vec3(0.0));
-	vec3 stripe = max(stripe_color - vec3(0.5), vec3(0.0));
-	baseColor.rgb += (base * teamMask.x) + (stripe * teamMask.y);
+	vec3 team_color = (base_color * teamMask.x) + (stripe_color * teamMask.y);
+	vec3 team_color_glow = (base_color * teamMask.b) + (stripe_color * teamMask.a);
+	#ifdef FLAG_HDR
+	team_color = pow(team_color, vec3(SRGB_GAMMA));
+	team_color_glow = pow(team_color_glow, vec3(SRGB_GAMMA)) * 3.0f;
+	#endif
+
+	baseColor.rgb += team_color;
 	baseColor.rgb = max(baseColor.rgb, vec3(0.0));
+	specColor.rgb += team_color;
+	specColor.rgb = max(specColor.rgb, vec3(0.03f));
  #endif
 #endif
 	// Lights aren't applied when we are rendering to the G-buffers since that gets handled later
@@ -348,7 +355,7 @@ void main()
  #ifdef FLAG_MISC_MAP
   #ifdef FLAG_TEAMCOLOR
 	float glowColorLuminance = dot(glowColor, vec3(0.299, 0.587, 0.114));
-	glowColor = team_glow_enabled ? mix((base * teamMask.b) + (stripe * teamMask.a), glowColor, clamp(glowColorLuminance - teamMask.b - teamMask.a, 0.0, 1.0)) : glowColor;
+	glowColor = team_glow_enabled ? mix(team_color_glow, glowColor, clamp(glowColorLuminance - teamMask.b - teamMask.a, 0.0, 1.0)) : glowColor;
   #endif
  #endif
    emissiveColor.rgb += glowColor * GLOW_MAP_INTENSITY;