Merge branch 'master' into martin-t/effects

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

diff --git a/qcsrc/menu/xonotic/skinlist.qc b/qcsrc/menu/xonotic/skinlist.qc
index 6e3f8a03377f51eb4c6e93094ac384c92079ba99..4683c45207a018753df987f7d26f1c98ceda86be 100644 (file)
--- a/qcsrc/menu/xonotic/skinlist.qc
+++ b/qcsrc/menu/xonotic/skinlist.qc
@@ -76,7 +76,7 @@ void XonoticSkinList_getSkins(entity me)
                fh = fopen(s, FILE_READ);
                if(fh < 0)
                {
-                       LOG_INFO("Warning: can't open skinvalues.txt file\n");
+                       LOG_INFO("Warning: can't open skinvalues.txt file");
                        continue;
                }
                while((s = fgets(fh)))
@@ -111,8 +111,10 @@ void XonoticSkinList_resizeNotify(entity me, vector relOrigin, vector relSize, v
        me.itemAbsSize = '0 0 0';
        SUPER(XonoticSkinList).resizeNotify(me, relOrigin, relSize, absOrigin, absSize);
 
-       me.realFontSize_y = me.fontSize / (me.itemAbsSize_y = (absSize.y * me.itemHeight));
-       me.realFontSize_x = me.fontSize / (me.itemAbsSize_x = (absSize.x * (1 - me.controlWidth)));
+       me.itemAbsSize.y = absSize.y * me.itemHeight;
+       me.itemAbsSize.x = absSize.x * (1 - me.controlWidth);
+       me.realFontSize.y = me.fontSize / me.itemAbsSize.y;
+       me.realFontSize.x = me.fontSize / me.itemAbsSize.x;
        me.realUpperMargin1 = 0.5 * (1 - 2.5 * me.realFontSize.y);
        me.realUpperMargin2 = me.realUpperMargin1 + 1.5 * me.realFontSize.y;