Merge branch 'master' into DefaultUser/trigger_cleanup

[xonotic/xonotic-data.pk3dir.git] / qcsrc / menu / item / nexposee.qh

diff --git a/qcsrc/menu/item/nexposee.qh b/qcsrc/menu/item/nexposee.qh
index 2d8e3ec49dfc1d8ea60bfdd23440bdaff74c548e..440413b5e59616332194103a7c6f1b30cb8f0649 100644 (file)
--- a/qcsrc/menu/item/nexposee.qh
+++ b/qcsrc/menu/item/nexposee.qh
@@ -5,7 +5,7 @@ CLASS(Nexposee, Container)
        METHOD(Nexposee, draw, void(entity));
        METHOD(Nexposee, keyDown, float(entity, float, float, float));
        METHOD(Nexposee, keyUp, float(entity, float, float, float));
-       METHOD(Nexposee, mousePress, float(entity, vector));
+       METHOD(Nexposee, mousePress, bool(Nexposee this, vector pos));
        METHOD(Nexposee, mouseMove, float(entity, vector));
        METHOD(Nexposee, mouseRelease, float(entity, vector));
        METHOD(Nexposee, mouseDrag, float(entity, vector));
@@ -13,14 +13,14 @@ CLASS(Nexposee, Container)
        METHOD(Nexposee, focusEnter, void(entity));
        METHOD(Nexposee, close, void(entity));
 
-       ATTRIB(Nexposee, animationState, float, -1)
-       ATTRIB(Nexposee, animationFactor, float, 0)
-       ATTRIB(Nexposee, selectedChild, entity, NULL)
-       ATTRIB(Nexposee, mouseFocusedChild, entity, NULL)
+       ATTRIB(Nexposee, animationState, float, -1);
+       ATTRIB(Nexposee, animationFactor, float, 0);
+       ATTRIB(Nexposee, selectedChild, entity);
+       ATTRIB(Nexposee, mouseFocusedChild, entity);
        METHOD(Nexposee, addItem, void(entity, entity, vector, vector, float));
        METHOD(Nexposee, calc, void(entity));
        METHOD(Nexposee, setNexposee, void(entity, entity, vector, float, float));
-       ATTRIB(Nexposee, mousePosition, vector, '0 0 0')
+       ATTRIB(Nexposee, mousePosition, vector, '0 0 0');
        METHOD(Nexposee, pullNexposee, void(entity, entity, vector));
 ENDCLASS(Nexposee)