X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fmenu%2Fxonotic%2Fcampaign.qc;h=900e085d8c6b1c655d5d9fa35b57752d12ab7e98;hb=af2f0cb624aaf967708b22e1303d113668af5114;hp=a3ad36355d9cece13deb37c750054cfe8794d0d2;hpb=7e5268799e95d0dd6f2b77ed4e097b0adc755f2b;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/menu/xonotic/campaign.qc b/qcsrc/menu/xonotic/campaign.qc
index a3ad36355..900e085d8 100644
--- a/qcsrc/menu/xonotic/campaign.qc
+++ b/qcsrc/menu/xonotic/campaign.qc
@@ -70,12 +70,12 @@ void XonoticCampaignList_loadCvars(entity me)
 {
 	// read campaign cvars
 	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
+	strcpy(me.controlledCvar, strcat("g_campaign", campaign_name, "_index"));
+	registercvar(me.controlledCvar, "", 0); // saved by server QC anyway
 	CampaignFile_Unload();
 	CampaignFile_Load(0, CAMPAIGN_MAX_ENTRIES);
-	me.campaignIndex = bound(0, cvar(me.cvarName), campaign_entries);
-	cvar_set(me.cvarName, ftos(me.campaignIndex));
+	me.campaignIndex = bound(0, cvar(me.controlledCvar), campaign_entries);
+	cvar_set(me.controlledCvar, ftos(me.campaignIndex));
 	if(me.columnNameSize)
 		rewrapCampaign(me.columnNameSize, me.rowsPerItem - 3, me.emptyLineHeight, me.realFontSize);
 	me.nItems = min(me.campaignIndex + 2, campaign_entries);
@@ -91,7 +91,7 @@ void XonoticCampaignList_saveCvars(entity me)
 	// write campaign cvars
 	// no reason to do this!
 	// cvar_set("g_campaign_name", campaign_name);
-	// cvar_set(me.cvarName, ftos(me.campaignIndex)); // NOTE: only server QC does that!
+	// cvar_set(me.controlledCvar, ftos(me.campaignIndex)); // NOTE: only server QC does that!
 }
 
 void XonoticCampaignList_campaignGo(entity me, float step)
@@ -155,7 +155,7 @@ void XonoticCampaignList_draw(entity me)
 	if(me.buttonPrev)
 		me.buttonPrev.disabled = !me.hasPrevCampaign;
 
-	if(cvar(me.cvarName) != me.campaignIndex || cvar_string("g_campaign_name") != campaign_name)
+	if(cvar(me.controlledCvar) != me.campaignIndex || cvar_string("g_campaign_name") != campaign_name)
 		me.loadCvars(me);
 	SUPER(XonoticCampaignList).draw(me);
 }
@@ -183,6 +183,9 @@ void XonoticCampaignList_resizeNotify(entity me, vector relOrigin, vector relSiz
 
 	me.checkMarkOrigin = eY + eX * (me.columnCheckMarkOrigin + me.columnCheckMarkSize) - me.checkMarkSize;
 
+	me.typeIconOrigin = vec3(me.columnPreviewSize - me.checkMarkSize.x, me.checkMarkOrigin.y, 0);
+	me.typeIconSize = me.checkMarkSize;
+
 	rewrapCampaign(me.columnNameSize, me.rowsPerItem - 3, me.emptyLineHeight, me.realFontSize);
 }
 void XonoticCampaignList_doubleClickListBoxItem(entity me, float i, vector where)
@@ -226,13 +229,19 @@ void XonoticCampaignList_drawListBoxItem(entity me, int i, vector absSize, bool
 	else
 		draw_Picture(me.columnPreviewOrigin * eX, strcat("/maps/", campaign_mapname[i]), me.columnPreviewSize * eX + eY, '1 1 1', theAlpha);
 
+	s = strcat("/gfx/menu/", cvar_string("menu_skin"), "/gametype_", campaign_gametype[i]);
+	if(i <= me.campaignIndex && draw_PictureSize(s) != '0 0 0')
+		draw_Picture(me.typeIconOrigin, s, me.typeIconSize, '1 1 1', 1);
+
 	if(i < me.campaignIndex)
 		draw_Picture(me.checkMarkOrigin, "checkmark", me.checkMarkSize, '1 1 1', 1);
 	if(i <= me.campaignIndex)
 		s = campaign_shortdesc[i]; // fteqcc sucks
 	else
 		s = "???";
-	s = draw_TextShortenToWidth(sprintf(_("Level %d: %s"), i+1, s), me.columnNameSize, 0, me.realFontSize);
+	// NOTE the following string should be equal to the one used in the Welcome dialog
+	// to avoid adding a slightly different string to translate
+	s = draw_TextShortenToWidth(strcat(sprintf(_("Level %d:"), i+1), " ", s), me.columnNameSize, 0, me.realFontSize);
 	draw_Text(me.realUpperMargin1 * eY + (me.columnNameOrigin + 0.00 * (me.columnNameSize - draw_TextWidth(s, 0, me.realFontSize))) * eX, s, me.realFontSize, theColor, theAlpha, 0);
 
 	if(i <= me.campaignIndex)