Comment on my last fix

[voretournament/voretournament.git] / data / qcsrc / menu / voret / campaign.c

diff --git a/data/qcsrc/menu/voret/campaign.c b/data/qcsrc/menu/voret/campaign.c
index 039cc9f74f1f0d599800701e9faee116a5fcaca2..e3a4315bb713ef163fe99324125cd40f9c8e6e22 100644 (file)
--- a/data/qcsrc/menu/voret/campaign.c
+++ b/data/qcsrc/menu/voret/campaign.c
@@ -125,7 +125,7 @@ void loadCvarsVoretCampaignList(entity me)
        me.campaignIndex = bound(0, cvar(me.cvarName), campaign_entries);\r
        cvar_set(me.cvarName, ftos(me.campaignIndex));\r
        if(me.columnNameSize)\r
-               rewrapCampaign(me.columnNameSize, me.rowsPerItem - 3, me.emptyLineHeight, me.realFontSize);\r
+               rewrapCampaign(me.columnNameSize, me.rowsPerItem - 2, me.emptyLineHeight, me.realFontSize);\r
        me.nItems = min(me.campaignIndex + 2, campaign_entries);\r
        me.selectedItem = min(me.campaignIndex, me.nItems - 1);\r
        me.scrollPos = me.nItems * me.itemHeight - 1;\r
@@ -217,8 +217,8 @@ void resizeNotifyVoretCampaignList(entity me, vector relOrigin, vector relSize,
 \r
        me.realFontSize_y = me.fontSize / (me.itemAbsSize_y = (absSize_y * me.itemHeight));\r
        me.realFontSize_x = me.fontSize / (me.itemAbsSize_x = (absSize_x * (1 - me.controlWidth)));\r
-       me.realUpperMargin1 = 0.25 * me.realFontSize_y;\r
-       me.realUpperMargin2 = me.realUpperMargin1 + 2 * me.realFontSize_y;\r
+       me.realUpperMargin1 = 0 * me.realFontSize_y;\r
+       me.realUpperMargin2 = me.realUpperMargin1 + 1.75 * me.realFontSize_y;\r
 \r
        me.checkMarkSize = (eX * (me.itemAbsSize_y / me.itemAbsSize_x) + eY) * 0.5;\r
 \r
@@ -275,7 +275,10 @@ void drawListBoxItemVoretCampaignList(entity me, float i, vector absSize, float
                draw_Fill('0 0 0', '1 1 0', SKINCOLOR_LISTBOX_SELECTED, SKINALPHA_LISTBOX_SELECTED);\r
 \r
        s = ftos(p);\r
-       draw_Picture(me.columnPreviewOrigin * eX, strcat("/maps/", campaign_mapname[i]), me.columnPreviewSize * eX + eY, '1 1 1', theAlpha);\r
+       if(i <= me.campaignIndex)\r
+               draw_Picture(me.columnPreviewOrigin * eX, strcat("/maps/", campaign_mapname[i]), me.columnPreviewSize * eX + eY, '1 1 1', theAlpha);\r
+       else\r
+               draw_Picture(me.columnPreviewOrigin * eX, "/gfx/campaign_hidden", me.columnPreviewSize * eX + eY, '1 1 1', theAlpha);\r
        if(i < me.campaignIndex)\r
                draw_Picture(me.checkMarkOrigin, "checkmark", me.checkMarkSize, '1 1 1', 1);\r
        if(i <= me.campaignIndex)\r