Merge branch 'master' into develop

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

diff --git a/qcsrc/menu/xonotic/campaign.qc b/qcsrc/menu/xonotic/campaign.qc
index 6f1d5111b84ea5c6c2af47e48e7430704293278a..900e085d8c6b1c655d5d9fa35b57752d12ab7e98 100644 (file)
--- 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);
 }
@@ -239,9 +239,9 @@ void XonoticCampaignList_drawListBoxItem(entity me, int i, vector absSize, bool
                s = campaign_shortdesc[i]; // fteqcc sucks
        else
                s = "???";
-       // NOTE the following string is equal to the one used in the campaign level notification
-       // (CAMPAIGN_MESSAGE) to avoid adding another duplicate string to translate
-       s = draw_TextShortenToWidth(strcat(sprintf(_("Level %s: "), itos(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)