X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fmenu%2Fxonotic%2Fcrosshairpicker.qc;h=31814125904ae84ee663c892c7ea6de98ba11c48;hb=3bbd344ce0194f454a4bde49ebfce3cb48c06279;hp=0ac826a44064cc4752b4c828a2b9c6c119e7a6e0;hpb=c89dfaa4d0342b98c320621557973a65114fbdf4;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/menu/xonotic/crosshairpicker.qc b/qcsrc/menu/xonotic/crosshairpicker.qc
index 0ac826a44..318141259 100644
--- a/qcsrc/menu/xonotic/crosshairpicker.qc
+++ b/qcsrc/menu/xonotic/crosshairpicker.qc
@@ -1,20 +1,4 @@
-#ifndef CROSSHAIRPICKER_H
-#define CROSSHAIRPICKER_H
-#include "picker.qc"
-CLASS(XonoticCrosshairPicker, XonoticPicker)
-	METHOD(XonoticCrosshairPicker, configureXonoticCrosshairPicker, void(entity));
-
-	ATTRIB(XonoticCrosshairPicker, rows, float, 3)
-	ATTRIB(XonoticCrosshairPicker, columns, float, 12)
-
-	METHOD(XonoticCrosshairPicker, cellSelect, void(entity, vector));
-	METHOD(XonoticCrosshairPicker, cellIsValid, bool(entity, vector));
-	METHOD(XonoticCrosshairPicker, cellDraw, void(entity, vector, vector));
-ENDCLASS(XonoticCrosshairPicker)
-entity makeXonoticCrosshairPicker();
-#endif
-
-#ifdef IMPLEMENTATION
+#include "crosshairpicker.qh"
 
 string crosshairpicker_cellToCrosshair(entity me, vector cell)
 {
@@ -60,20 +44,18 @@ bool XonoticCrosshairPicker_cellIsValid(entity me, vector cell)
 
 void XonoticCrosshairPicker_cellDraw(entity me, vector cell, vector cellPos)
 {
-	vector sz;
-	string cross = strcat("/gfx/crosshair", crosshairpicker_cellToCrosshair(me, cell));
-	sz = draw_PictureSize(cross);
+	string s = strcat("/gfx/crosshair", crosshairpicker_cellToCrosshair(me, cell));
+	vector sz = draw_PictureSize(s);
 	sz = globalToBoxSize(sz, me.size);
 
 	float ar = sz.x / sz.y;
 	sz.x = me.realCellSize.x;
 	sz.y = sz.x / ar;
-	sz = sz * 0.95;
+	sz *= 0.95;
 
 	vector crosshairPos = cellPos + 0.5 * me.realCellSize;
-	draw_Picture(crosshairPos - 0.5 * sz, cross, sz, SKINCOLOR_CROSSHAIRPICKER_CROSSHAIR, SKINALPHA_CROSSHAIRPICKER_CROSSHAIR);
+	draw_Picture(crosshairPos - 0.5 * sz, s, sz, SKINCOLOR_CROSSHAIRPICKER_CROSSHAIR, SKINALPHA_CROSSHAIRPICKER_CROSSHAIR);
 
 	if(cvar("crosshair_dot"))
 		draw_Picture(crosshairPos - 0.5 * sz * cvar("crosshair_dot_size"), "/gfx/crosshairdot", sz * cvar("crosshair_dot_size"), SKINCOLOR_CROSSHAIRPICKER_CROSSHAIR, SKINALPHA_CROSSHAIRPICKER_CROSSHAIR);
 }
-#endif