X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fmenu%2Fxonotic%2Fpicker.qc;h=527697683218d87a2550f862ddd36b2a3dd67299;hb=45d8904a100765555e622598a39967963733df1d;hp=dd574676e08f37881b9bc19bef1d00ec3ff9b356;hpb=1bc3ab0285f65c7ed0c75cbba00da2460921c973;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/menu/xonotic/picker.qc b/qcsrc/menu/xonotic/picker.qc
index dd574676e..527697683 100644
--- a/qcsrc/menu/xonotic/picker.qc
+++ b/qcsrc/menu/xonotic/picker.qc
@@ -1,37 +1,6 @@
-#ifndef PICKER_H
-#define PICKER_H
-#include "../item.qc"
-CLASS(XonoticPicker, Item)
-	METHOD(XonoticPicker, configureXonoticPicker, void(entity))
-	METHOD(XonoticPicker, mousePress, float(entity, vector))
-	METHOD(XonoticPicker, mouseRelease, float(entity, vector))
-	METHOD(XonoticPicker, mouseMove, float(entity, vector))
-	METHOD(XonoticPicker, mouseDrag, float(entity, vector))
-	METHOD(XonoticPicker, keyDown, float(entity, float, float, float))
-	METHOD(XonoticPicker, draw, void(entity))
-	ATTRIB(XonoticPicker, focusable, float, 1)
-	ATTRIB(XonoticPicker, disabled, float, 0)
-	ATTRIB(XonoticPicker, alpha, float, 1)
-	ATTRIB(XonoticPicker, disabledAlpha, float, SKINALPHA_DISABLED)
-
-	ATTRIB(XonoticPicker, rows, float, 3)
-	ATTRIB(XonoticPicker, columns, float, 2)
-
-	METHOD(XonoticPicker, moveFocus, void(entity, vector, vector))
-	METHOD(XonoticPicker, cellSelect, void(entity, vector))
-	METHOD(XonoticPicker, cellDraw, void(entity, vector, vector))
-	METHOD(XonoticPicker, cellIsValid, bool(entity, vector))
-	ATTRIB(XonoticPicker, realCellSize, vector, '0 0 0')
-	ATTRIB(XonoticPicker, selectedCell, vector, '-1 -1 0')
-	ATTRIB(XonoticPicker, focusedCell, vector, '-1 -1 0')
-	ATTRIB(XonoticPicker, focusedCellAlpha, float, 0)
-	ATTRIB(XonoticPicker, focusedCellTime, float, 0)
-	ATTRIB(XonoticPicker, pressedCell, vector, '-1 -1 0')
-ENDCLASS(XonoticPicker)
-entity makeXonoticPicker();
-#endif
-
-#ifdef IMPLEMENTATION
+#include "picker.qh"
+
+.bool pressed;
 
 entity makeXonoticPicker()
 {
@@ -70,17 +39,17 @@ float XonoticPicker_mouseDrag(entity me, vector coords)
 	return me.mouseMove(me, coords);
 }
 
-float XonoticPicker_mousePress(entity me, vector coords)
+METHOD(XonoticPicker, mousePress, bool(XonoticPicker this, vector pos))
 {
-	me.mouseMove(me, coords);
+	this.mouseMove(this, pos);
 
-	if(me.focusedCell.x >= 0)
+	if(this.focusedCell.x >= 0)
 	{
-		me.pressed = 1;
-		me.pressedCell = me.focusedCell;
+		this.pressed = 1;
+		this.pressedCell = this.focusedCell;
 	}
 
-	return 1;
+	return true;
 }
 
 float XonoticPicker_mouseRelease(entity me, vector coords)
@@ -204,4 +173,3 @@ void XonoticPicker_draw(entity me)
 
 	SUPER(XonoticPicker).draw(me);
 }
-#endif