X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fmenu%2Fxonotic%2Fscrollpanel.qc;h=4543f0bc48e011f16f801ca69761c4c36746b374;hb=52cdd440f6cfdc9544099ac68455e5361ace00d2;hp=874a0aff16ab5e7b7b1560dec03d227d0ae00115;hpb=1b0decb9afb829407eae763b3053a122e2ae3de6;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/menu/xonotic/scrollpanel.qc b/qcsrc/menu/xonotic/scrollpanel.qc
index 874a0aff1..4543f0bc4 100644
--- a/qcsrc/menu/xonotic/scrollpanel.qc
+++ b/qcsrc/menu/xonotic/scrollpanel.qc
@@ -18,16 +18,16 @@ METHOD(XonoticScrollPanel, resizeNotify, void(XonoticScrollPanel this, vector re
 	p.resizeNotify(p, relOrigin, relSize, absOrigin, absSize);
 }
 
-#define X(x) \
-METHOD(XonoticScrollPanel, x, bool(XonoticScrollPanel this, vector pos)) \
+#define X(mouseFunc) \
+METHOD(XonoticScrollPanel, mouseFunc, bool(XonoticScrollPanel this, vector pos)) \
 { \
-	SUPER(XonoticScrollPanel).x(this, pos); \
+	SUPER(XonoticScrollPanel).mouseFunc(this, pos); \
 	XonoticTab p = this.currentPanel; \
 	this.setFocus(this, p); \
 	\
 	vector o = -eY * this.scrollPos; \
 	vector s = eX * (1 - this.controlWidth) + eY * this.itemHeight; \
-	return p.x(p, globalToBox(pos, o, s)); \
+	return p.mouseFunc(p, globalToBox(pos, o, s)); \
 }
 X(mouseMove)
 X(mousePress)
@@ -35,11 +35,11 @@ X(mouseDrag)
 X(mouseRelease)
 #undef X
 
-#define X(x) \
-METHOD(XonoticScrollPanel, x, bool(XonoticScrollPanel this, int key, int ascii, bool shift)) \
+#define X(keyFunc) \
+METHOD(XonoticScrollPanel, keyFunc, bool(XonoticScrollPanel this, int key, int ascii, bool shift)) \
 { \
 	XonoticTab p = this.currentPanel; \
-	return p.x(p, key, ascii, shift) || SUPER(XonoticScrollPanel).x(this, key, ascii, shift); \
+	return p.keyFunc(p, key, ascii, shift) || SUPER(XonoticScrollPanel).keyFunc(this, key, ascii, shift); \
 }
 X(keyDown)
 X(keyUp)