Merge remote-tracking branch 'origin/master' into terencehill/listbox_item_highlight

[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 3e37c34f109258f75a508f453911b59f7c0df4a7..2b98c5fe52296a8f287c4294a3766019487262ea 100644 (file)
--- a/qcsrc/menu/xonotic/soundlist.qc
+++ b/qcsrc/menu/xonotic/soundlist.qc
@@ -1,5 +1,7 @@
-#ifdef INTERFACE
-CLASS(XonoticSoundList) EXTENDS(XonoticListBox)
+#ifndef SOUNDLIST_H
+#define SOUNDLIST_H
+#include "listbox.qc"
+CLASS(XonoticSoundList, XonoticListBox)

        METHOD(XonoticSoundList, configureXonoticSoundList, void(entity))
        ATTRIB(XonoticSoundList, rowsPerItem, float, 1)
        METHOD(XonoticSoundList, resizeNotify, void(entity, vector, vector, vector, vector))
        METHOD(XonoticSoundList, configureXonoticSoundList, void(entity))
        ATTRIB(XonoticSoundList, rowsPerItem, float, 1)
        METHOD(XonoticSoundList, resizeNotify, void(entity, vector, vector, vector, vector))


@@ -38,7 +40,7 @@ void SoundList_Menu_Track_Reset(entity box, entity me);
 entity makeXonoticSoundList()
 {
        entity me;
 entity makeXonoticSoundList()
 {
        entity me;

-       me = spawnXonoticSoundList();
+       me = NEW(XonoticSoundList);

        me.configureXonoticSoundList(me);
        return me;
 }
        me.configureXonoticSoundList(me);
        return me;
 }