X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fmenu%2Fxonotic%2Fcrosshairbutton.c;h=645b9320750fcedced0f2c6b7f0ec5947a7af888;hb=4fc59bbd7e2d4f25ba21952ed50ae754295a7faa;hp=b290f3d218b1faab5a5ee5de4e8ff7770a827a09;hpb=1b9fb2415152cf5a365cfaf9cf234372aaba6852;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/menu/xonotic/crosshairbutton.c b/qcsrc/menu/xonotic/crosshairbutton.c
index b290f3d21..645b93207 100644
--- a/qcsrc/menu/xonotic/crosshairbutton.c
+++ b/qcsrc/menu/xonotic/crosshairbutton.c
@@ -8,6 +8,7 @@ CLASS(XonoticCrosshairButton) EXTENDS(RadioButton)
 
 	ATTRIB(XonoticCrosshairButton, useDownAsChecked, float, 1)
 	ATTRIB(XonoticCrosshairButton, src3, string, string_null)
+	ATTRIB(XonoticCrosshairButton, src4, string, string_null)
 
 	ATTRIB(XonoticCrosshairButton, cvarName, string, string_null)
 	ATTRIB(XonoticCrosshairButton, cvarValueFloat, float, 0)
@@ -33,6 +34,7 @@ void XonoticCrosshairButton_configureXonoticCrosshairButton(entity me, float the
 	me.configureRadioButton(me, string_null, me.fontSize, me.image, theGroup, 0);
 	me.srcMulti = 1;
 	me.src3 = strzone(strcat("/gfx/crosshair", ftos(me.cvarValueFloat)));
+	me.src4 = "/gfx/crosshairdot";
 }
 void XonoticCrosshairButton_setChecked(entity me, float val)
 {
@@ -64,7 +66,7 @@ void XonoticCrosshairButton_draw(entity me)
 	float a;
 
 	rgb = eX * cvar("crosshair_color_red") + eY * cvar("crosshair_color_green") + eZ * cvar("crosshair_color_blue");
-	a = cvar("crosshair_color_alpha");
+	a = cvar("crosshair_alpha");
 
 	if(!me.checked && !me.focused)
 	{
@@ -76,12 +78,14 @@ void XonoticCrosshairButton_draw(entity me)
 
 	sz = draw_PictureSize(me.src3);
 	sz = globalToBoxSize(sz, draw_scale);
-	sz = sz * cvar("crosshair_size");
+	sz = (10 * '1 1 0' + sz * cvar("crosshair_size")) * 0.05; // (10 * '1 1 0' + ...) * 0.05 here to make visible size changes happen also at bigger sizes
 	if(sz_x > 0.95)
 		sz = sz * (0.95 / sz_x);
 	if(sz_y > 0.95)
 		sz = sz * (0.95 / sz_y);
 
 	draw_Picture('0.5 0.5 0' - 0.5 * sz, me.src3, sz, rgb, a);
+	if(cvar("crosshair_dot"))
+		draw_Picture('0.5 0.5 0' - 0.5 * sz * cvar("crosshair_dot_size"), me.src4, sz * cvar("crosshair_dot_size"), rgb, a * cvar("crosshair_dot_alpha"));
 }
 #endif