Merge branch 'master' into terencehill/translated_keys
authorterencehill <piuntn@gmail.com>
Sun, 21 Apr 2019 15:44:04 +0000 (17:44 +0200)
committerterencehill <piuntn@gmail.com>
Sun, 21 Apr 2019 15:44:04 +0000 (17:44 +0200)
1  2 
qcsrc/client/main.qc
qcsrc/common/util.qc
qcsrc/common/util.qh
qcsrc/menu/xonotic/keybinder.qc

Simple merge
Simple merge
Simple merge
@@@ -438,10 -459,10 +460,10 @@@ void XonoticKeyBinder_drawListBoxItem(e
                        {
                                if(s != "")
                                        s = strcat(s, ", ");
 -                              s = strcat(s, keynumtostring(k));
 +                              s = strcat(s, translate_key(keynumtostring(k)));
                        }
                }
-               s = draw_TextShortenToWidth(s, me.columnKeysSize, 0, me.realFontSize);
-               draw_CenterText(me.realUpperMargin * eY + (me.columnKeysOrigin + 0.5 * me.columnKeysSize) * eX, s, me.realFontSize, theColor, theAlpha, 0);
        }
+       s = draw_TextShortenToWidth(s, me.columnKeysSize, 0, me.realFontSize);
+       draw_CenterText(me.realUpperMargin * eY + (me.columnKeysOrigin + 0.5 * me.columnKeysSize) * eX, s, me.realFontSize, theColor, theAlpha, 0);
  }