Merge branch 'master' into terencehill/hud_cleanups

[xonotic/xonotic-data.pk3dir.git] / qcsrc / menu / xonotic / soundlist.qc

diff --git a/qcsrc/menu/xonotic/soundlist.qc b/qcsrc/menu/xonotic/soundlist.qc
index 2b98c5fe52296a8f287c4294a3766019487262ea..159cd76c53d60a2bfe8c3b3c73c9fea6a74b9679 100644 (file)
--- a/qcsrc/menu/xonotic/soundlist.qc
+++ b/qcsrc/menu/xonotic/soundlist.qc
@@ -2,16 +2,16 @@
 #define SOUNDLIST_H
 #include "listbox.qc"
 CLASS(XonoticSoundList, XonoticListBox)
-       METHOD(XonoticSoundList, configureXonoticSoundList, void(entity))
+       METHOD(XonoticSoundList, configureXonoticSoundList, void(entity));
        ATTRIB(XonoticSoundList, rowsPerItem, float, 1)
-       METHOD(XonoticSoundList, resizeNotify, void(entity, vector, vector, vector, vector))
-       METHOD(XonoticSoundList, drawListBoxItem, void(entity, int, vector, bool, bool))
-       METHOD(XonoticSoundList, getSounds, void(entity))
-       METHOD(XonoticSoundList, soundName, string(entity, float))
-       METHOD(XonoticSoundList, doubleClickListBoxItem, void(entity, float, vector))
-       METHOD(XonoticSoundList, keyDown, float(entity, float, float, float))
-       METHOD(XonoticSoundList, destroy, void(entity))
-       METHOD(XonoticSoundList, showNotify, void(entity))
+       METHOD(XonoticSoundList, resizeNotify, void(entity, vector, vector, vector, vector));
+       METHOD(XonoticSoundList, drawListBoxItem, void(entity, int, vector, bool, bool));
+       METHOD(XonoticSoundList, getSounds, void(entity));
+       METHOD(XonoticSoundList, soundName, string(entity, float));
+       METHOD(XonoticSoundList, doubleClickListBoxItem, void(entity, float, vector));
+       METHOD(XonoticSoundList, keyDown, float(entity, float, float, float));
+       METHOD(XonoticSoundList, destroy, void(entity));
+       METHOD(XonoticSoundList, showNotify, void(entity));
 
        ATTRIB(XonoticSoundList, listSound, float, -1)
        ATTRIB(XonoticSoundList, realFontSize, vector, '0 0 0')
@@ -24,7 +24,7 @@ CLASS(XonoticSoundList, XonoticListBox)
        ATTRIB(XonoticSoundList, itemAbsSize, vector, '0 0 0')
 
        ATTRIB(XonoticSoundList, filterString, string, string_null)
-       ATTRIB(XonoticSoundList, playlist, entity, world)
+       ATTRIB(XonoticSoundList, playlist, entity, NULL)
 ENDCLASS(XonoticSoundList)
 
 entity makeXonoticSoundList();