Merge branch 'TimePath/experiments/csqc_prediction' into Mario/qc_physics

[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 6d11fe9c6574eaf510d2e94ab23b5446b07ced01..9990c83fe162ee2c2ab4f37ea7e1c43a1fcf24ce 100644 (file)
--- a/qcsrc/menu/xonotic/skinlist.qc
+++ b/qcsrc/menu/xonotic/skinlist.qc
@@ -86,7 +86,7 @@ void XonoticSkinList_getSkins(entity me)
        string s;
 
        buf = buf_create();
-       glob = search_begin("gfx/menu/*/skinvalues.txt", TRUE, TRUE);
+       glob = search_begin("gfx/menu/*/skinvalues.txt", true, true);
        if(glob < 0)
        {
                me.skinlist = buf;
@@ -138,15 +138,15 @@ 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.realUpperMargin1 = 0.5 * (1 - 2.5 * me.realFontSize_y);
-       me.realUpperMargin2 = me.realUpperMargin1 + 1.5 * me.realFontSize_y;
+       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.realUpperMargin1 = 0.5 * (1 - 2.5 * me.realFontSize.y);
+       me.realUpperMargin2 = me.realUpperMargin1 + 1.5 * me.realFontSize.y;
 
        me.columnPreviewOrigin = 0;
-       me.columnPreviewSize = me.itemAbsSize_y / me.itemAbsSize_x * 4 / 3;
-       me.columnNameOrigin = me.columnPreviewOrigin + me.columnPreviewSize + me.realFontSize_x;
-       me.columnNameSize = 1 - me.columnPreviewSize - 2 * me.realFontSize_x;
+       me.columnPreviewSize = me.itemAbsSize.y / me.itemAbsSize.x * 4 / 3;
+       me.columnNameOrigin = me.columnPreviewOrigin + me.columnPreviewSize + me.realFontSize.x;
+       me.columnNameSize = 1 - me.columnPreviewSize - 2 * me.realFontSize.x;
 }
 
 void XonoticSkinList_drawListBoxItem(entity me, float i, vector absSize, float isSelected)
@@ -181,12 +181,15 @@ void SetSkin_Click(entity btn, entity me)
 
 void XonoticSkinList_doubleClickListBoxItem(entity me, float i, vector where)
 {
+       m_play_click_sound(MENU_SOUND_EXECUTE);
        me.setSkin(me);
 }
 
 float XonoticSkinList_keyDown(entity me, float scan, float ascii, float shift)
 {
-       if(scan == K_ENTER || scan == K_KP_ENTER) {
+       if(scan == K_ENTER || scan == K_KP_ENTER)
+       {
+               m_play_click_sound(MENU_SOUND_EXECUTE);
                me.setSkin(me);
                return 1;
        }