X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fmenu%2Fxonotic%2Fcampaign.qc;h=cb418a4e1834fcce6076672f337e818fef681ca5;hb=45dfc727cef14412598d619e1704d1b70dc64b64;hp=2387735165ca70229a5797ded781fe6acc3b5261;hpb=99c1b6ca80a69e112d410ee493d62f757b2c6df8;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/menu/xonotic/campaign.qc b/qcsrc/menu/xonotic/campaign.qc
index 238773516..cb418a4e1 100644
--- a/qcsrc/menu/xonotic/campaign.qc
+++ b/qcsrc/menu/xonotic/campaign.qc
@@ -1,53 +1,8 @@
-#include "../../common/campaign_common.qh"
+#include "campaign.qh"
 
-#ifndef CAMPAIGN_H
-#define CAMPAIGN_H
-#include "listbox.qc"
-CLASS(XonoticCampaignList, XonoticListBox)
-	METHOD(XonoticCampaignList, configureXonoticCampaignList, void(entity))
-	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))
-	METHOD(XonoticCampaignList, resizeNotify, void(entity, vector, vector, vector, vector))
-	METHOD(XonoticCampaignList, setSelected, void(entity, float))
-	METHOD(XonoticCampaignList, keyDown, float(entity, float, float, float))
-	METHOD(XonoticCampaignList, campaignGo, void(entity, float))
-	METHOD(XonoticCampaignList, destroy, void(entity))
+#include <common/campaign_common.qh>
+#include "inputbox.qh"
 
-	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, campaignIndex, float, 0)
-	ATTRIB(XonoticCampaignList, cvarName, string, string_null)
-	METHOD(XonoticCampaignList, loadCvars, void(entity))
-	METHOD(XonoticCampaignList, saveCvars, void(entity))
-
-	ATTRIB(XonoticCampaignList, buttonNext, entity, NULL)
-	ATTRIB(XonoticCampaignList, buttonPrev, entity, NULL)
-	ATTRIB(XonoticCampaignList, labelTitle, entity, NULL)
-ENDCLASS(XonoticCampaignList)
-entity makeXonoticCampaignList();
-void CampaignList_LoadMap(entity btn, entity me);
-void MultiCampaign_Next(entity btn, entity me);
-void MultiCampaign_Prev(entity btn, entity me);
-#endif
-
-#ifdef IMPLEMENTATION
 string campaign_longdesc_wrapped[CAMPAIGN_MAX_ENTRIES];
 
 void rewrapCampaign(float w, float l0, float emptyheight, vector theFontSize)
@@ -82,11 +37,11 @@ void rewrapCampaign(float w, float l0, float emptyheight, vector theFontSize)
 			}
 		}
 		goto nottoolong;
-:toolong
+LABEL(toolong)
 		while(substring(r, strlen(r) - 1, 1) == "\n")
 			r = substring(r, 0, strlen(r) - 1);
 		r = strcat(r, "...\n");
-:nottoolong
+LABEL(nottoolong)
 		campaign_longdesc_wrapped[i] = strzone(substring(r, 0, strlen(r) - 1));
 	}
 }
@@ -322,4 +277,3 @@ float XonoticCampaignList_keyDown(entity me, float scan, float ascii, float shif
 		return SUPER(XonoticCampaignList).keyDown(me, scan, ascii, shift);
 	return 1;
 }
-#endif