X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fmenu%2Fxonotic%2Fcampaign.qc;h=9f953f66f542f9a8b9238d65e813a6b5cdf777c7;hb=bc3f297ed082b23fb33dd0d8f5dcd33bb0198507;hp=36c74831038bc3e16ae6abe247dfe2e78bccabeb;hpb=2277d6a8dae21161ac758a1cc3b0a1a10016d8e0;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/menu/xonotic/campaign.qc b/qcsrc/menu/xonotic/campaign.qc
index 36c748310..9f953f66f 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)
@@ -59,8 +14,7 @@ void rewrapCampaign(float w, float l0, float emptyheight, vector theFontSize)
 	for(i = 0; i < campaign_entries; ++i)
 	{
 		l = l0;
-		if(campaign_longdesc_wrapped[i])
-			strunzone(campaign_longdesc_wrapped[i]);
+		strfree(campaign_longdesc_wrapped[i]);
 		n = tokenizebyseparator(campaign_longdesc[i], "\n");
 		r = "";
 		for(j = 0; j < n; ++j)
@@ -82,11 +36,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));
 	}
 }
@@ -115,12 +69,8 @@ void XonoticCampaignList_destroy(entity me)
 void XonoticCampaignList_loadCvars(entity me)
 {
 	// read campaign cvars
-	if(campaign_name)
-		strunzone(campaign_name);
-	if(me.cvarName)
-		strunzone(me.cvarName);
-	campaign_name = strzone(cvar_string("g_campaign_name"));
-	me.cvarName = strzone(strcat("g_campaign", campaign_name, "_index"));
+	strcpy(campaign_name, cvar_string("g_campaign_name"));
+	strcpy(me.cvarName, strcat("g_campaign", campaign_name, "_index"));
 	registercvar(me.cvarName, "", 0); // saved by server QC anyway
 	CampaignFile_Unload();
 	CampaignFile_Load(0, CAMPAIGN_MAX_ENTRIES);
@@ -129,8 +79,9 @@ void XonoticCampaignList_loadCvars(entity me)
 	if(me.columnNameSize)
 		rewrapCampaign(me.columnNameSize, me.rowsPerItem - 3, me.emptyLineHeight, me.realFontSize);
 	me.nItems = min(me.campaignIndex + 2, campaign_entries);
-	me.scrollPos = me.nItems * me.itemHeight - 1;
 	me.setSelected(me, min(me.campaignIndex, me.nItems - 1));
+	if(me.nItems - 1 > me.campaignIndex)
+		me.scrollToItem(me, me.nItems - 1);
 	if(me.labelTitle)
 		me.labelTitle.setText(me.labelTitle, campaign_title);
 }
@@ -321,4 +272,3 @@ float XonoticCampaignList_keyDown(entity me, float scan, float ascii, float shif
 		return SUPER(XonoticCampaignList).keyDown(me, scan, ascii, shift);
 	return 1;
 }
-#endif