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

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

diff --git a/qcsrc/menu/xonotic/languagelist.qc b/qcsrc/menu/xonotic/languagelist.qc
index 4f010134142e0577f899e9f74d92b24ada90d588..af9d75211b3987809ec4bedb3eff1e85d3813990 100644 (file)
--- a/qcsrc/menu/xonotic/languagelist.qc
+++ b/qcsrc/menu/xonotic/languagelist.qc
@@ -1,5 +1,7 @@
-#ifdef INTERFACE
-CLASS(XonoticLanguageList) EXTENDS(XonoticListBox)
+#ifndef LANGUAGELIST_H
+#define LANGUAGELIST_H
+#include "listbox.qc"
+CLASS(XonoticLanguageList, XonoticListBox)
        METHOD(XonoticLanguageList, configureXonoticLanguageList, void(entity))
        ATTRIB(XonoticLanguageList, rowsPerItem, float, 1)
        METHOD(XonoticLanguageList, drawListBoxItem, void(entity, int, vector, bool, bool))
@@ -43,7 +45,7 @@ const float LANGPARM_COUNT = 4;
 entity makeXonoticLanguageList()
 {
        entity me;
-       me = spawnXonoticLanguageList();
+       me = NEW(XonoticLanguageList);
        me.configureXonoticLanguageList(me);
        return me;
 }