Clean up a bunch of gamemode specific references

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

diff --git a/qcsrc/menu/xonotic/campaign.qh b/qcsrc/menu/xonotic/campaign.qh
index 17585a86d4f51233f0d6963b3dee85d4ec1d81db..298e27587466697572311d048684b11a2dc21db9 100644 (file)
--- a/qcsrc/menu/xonotic/campaign.qh
+++ b/qcsrc/menu/xonotic/campaign.qh
@@ -3,7 +3,7 @@
 #include "listbox.qh"
 CLASS(XonoticCampaignList, XonoticListBox)
        METHOD(XonoticCampaignList, configureXonoticCampaignList, void(entity));
-       ATTRIB(XonoticCampaignList, rowsPerItem, float, 10)
+       ATTRIB(XonoticCampaignList, rowsPerItem, float, 10);
        METHOD(XonoticCampaignList, draw, void(entity));
        METHOD(XonoticCampaignList, drawListBoxItem, void(entity, int, vector, bool, bool));
        METHOD(XonoticCampaignList, doubleClickListBoxItem, void(entity, float, vector));
@@ -13,31 +13,33 @@ CLASS(XonoticCampaignList, XonoticListBox)
        METHOD(XonoticCampaignList, campaignGo, void(entity, float));
        METHOD(XonoticCampaignList, destroy, void(entity));
 
-       ATTRIB(XonoticCampaignList, campaignGlob, float, 0)
-       ATTRIB(XonoticCampaignList, realFontSize, vector, '0 0 0')
-       ATTRIB(XonoticCampaignList, columnPreviewOrigin, float, 0)
-       ATTRIB(XonoticCampaignList, columnPreviewSize, float, 0)
-       ATTRIB(XonoticCampaignList, columnNameOrigin, float, 0)
-       ATTRIB(XonoticCampaignList, columnNameSize, float, 0)
-       ATTRIB(XonoticCampaignList, columnCheckMarkOrigin, float, 0)
-       ATTRIB(XonoticCampaignList, columnCheckMarkSize, float, 0)
-       ATTRIB(XonoticCampaignList, checkMarkOrigin, vector, '0 0 0')
-       ATTRIB(XonoticCampaignList, checkMarkSize, vector, '0 0 0')
-       ATTRIB(XonoticCampaignList, realUpperMargin1, float, 0)
-       ATTRIB(XonoticCampaignList, realUpperMargin2, float, 0)
+       ATTRIB(XonoticCampaignList, campaignGlob, float, 0);
+       ATTRIB(XonoticCampaignList, realFontSize, vector, '0 0 0');
+       ATTRIB(XonoticCampaignList, columnPreviewOrigin, float, 0);
+       ATTRIB(XonoticCampaignList, columnPreviewSize, float, 0);
+       ATTRIB(XonoticCampaignList, columnNameOrigin, float, 0);
+       ATTRIB(XonoticCampaignList, columnNameSize, float, 0);
+       ATTRIB(XonoticCampaignList, columnCheckMarkOrigin, float, 0);
+       ATTRIB(XonoticCampaignList, columnCheckMarkSize, float, 0);
+       ATTRIB(XonoticCampaignList, checkMarkOrigin, vector, '0 0 0');
+       ATTRIB(XonoticCampaignList, checkMarkSize, vector, '0 0 0');
+       ATTRIB(XonoticCampaignList, realUpperMargin1, float, 0);
+       ATTRIB(XonoticCampaignList, realUpperMargin2, float, 0);
 
-       ATTRIB(XonoticCampaignList, origin, vector, '0 0 0')
-       ATTRIB(XonoticCampaignList, itemAbsSize, vector, '0 0 0')
-       ATTRIB(XonoticCampaignList, emptyLineHeight, float, 0.5)
+       ATTRIB(XonoticCampaignList, origin, vector, '0 0 0');
+       ATTRIB(XonoticCampaignList, itemAbsSize, vector, '0 0 0');
+       ATTRIB(XonoticCampaignList, emptyLineHeight, float, 0.5);
 
-       ATTRIB(XonoticCampaignList, campaignIndex, float, 0)
-       ATTRIB(XonoticCampaignList, cvarName, string, string_null)
+       ATTRIB(XonoticCampaignList, campaignIndex, float, 0);
+       ATTRIB(XonoticCampaignList, cvarName, string);
        METHOD(XonoticCampaignList, loadCvars, void(entity));
        METHOD(XonoticCampaignList, saveCvars, void(entity));
+       ATTRIB(XonoticCampaignList, hasNextCampaign, bool, false);
+       ATTRIB(XonoticCampaignList, hasPrevCampaign, bool, false);
 
-       ATTRIB(XonoticCampaignList, buttonNext, entity, NULL)
-       ATTRIB(XonoticCampaignList, buttonPrev, entity, NULL)
-       ATTRIB(XonoticCampaignList, labelTitle, entity, NULL)
+       ATTRIB(XonoticCampaignList, buttonNext, entity);
+       ATTRIB(XonoticCampaignList, buttonPrev, entity);
+       ATTRIB(XonoticCampaignList, labelTitle, entity);
 ENDCLASS(XonoticCampaignList)
 entity makeXonoticCampaignList();
 void CampaignList_LoadMap(entity btn, entity me);