From: TimePath <andrew.hardaker1995@gmail.com>
Date: Sun, 16 Aug 2015 08:08:10 +0000 (+1000)
Subject: Actually use this.entryIcon and this.entryName
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=1e858e94dca21df4787d294b7f16b7030ad6947e;p=xonotic%2Fxonotic-data.pk3dir.git

Actually use this.entryIcon and this.entryName
---

diff --git a/qcsrc/menu/xonotic/dialog_media_guide_entries.qc b/qcsrc/menu/xonotic/dialog_media_guide_entries.qc
index e7498b3dd3..1c75b8e28b 100644
--- a/qcsrc/menu/xonotic/dialog_media_guide_entries.qc
+++ b/qcsrc/menu/xonotic/dialog_media_guide_entries.qc
@@ -62,8 +62,8 @@ void XonoticEntryList_drawListBoxItem(entity this, int i, vector absSize, bool i
         this.focusedItemAlpha = getFadedAlpha(this.focusedItemAlpha, SKINALPHA_LISTBOX_FOCUSED, SKINFADEALPHA_LISTBOX_FOCUSED);
         draw_Fill('0 0 0', '1 1 0', SKINCOLOR_LISTBOX_FOCUSED, this.focusedItemAlpha);
     }
-    string s = draw_TextShortenToWidth(strdecolorize(e.name), this.columnNameSize, 0, this.realFontSize);
-    draw_Picture(this.columnPreviewOrigin * eX, e.icon, this.columnPreviewSize * eX + eY, '1 1 1', SKINALPHA_LISTBOX_SELECTED);
+    string s = draw_TextShortenToWidth(strdecolorize(e.(this.entryName)), this.columnNameSize, 0, this.realFontSize);
+    draw_Picture(this.columnPreviewOrigin * eX, e.(this.entryIcon), this.columnPreviewSize * eX + eY, '1 1 1', SKINALPHA_LISTBOX_SELECTED);
     draw_Text(this.realUpperMargin1 * eY + (this.columnNameOrigin + 0.00 * (this.columnNameSize - draw_TextWidth(s, 0, this.realFontSize))) * eX, s, this.realFontSize, '1 1 1', SKINALPHA_TEXT, 0);
 }
 
@@ -105,7 +105,7 @@ void XonoticEntryList_refilter(entity this)
 {
     this.nItems = this.reload(this.stringFilter);
     for (int i = 0, n = this.nItems; i < n; ++i) {
-        draw_PreloadPicture(this.entries(i).icon);
+        draw_PreloadPicture(this.entries(i).(this.entryIcon));
     }
 }