Merge branch 'master' into terencehill/menu_gametype_tooltips_2

Conflicts:
	qcsrc/menu/xonotic/dialog_settings_game.qc

diff --cc qcsrc/common/mapinfo.qh
Simple merge

diff --cc qcsrc/menu/item/listbox.qc
Simple merge

diff --cc qcsrc/menu/xonotic/dialog_settings_game.qc
index cde5d40a6efd2c9287208eb6c74505667aeb129b,69ab6758226e19356fd8d9cd459c93dcd5f6ebe7..3c1503b29774472af5b256b37930c7736c454d81
--- 1/qcsrc/menu/xonotic/dialog_settings_game.qc
--- 2/qcsrc/menu/xonotic/dialog_settings_game.qc
+++ b/qcsrc/menu/xonotic/dialog_settings_game.qc
@@@ -12,14 -12,7 +12,14 @@@ CLASS(SettingSource, DataSource
          if (returns) returns(it.title, string_null);
          return it;
      }
-     METHOD(SettingSource, getEntryTooltip, entity(int i, void(string theTooltip) returns))
++    METHOD(SettingSource, getEntryTooltip, entity(entity this, int i, void(string theTooltip) returns))
 +    {
-         Lazy l = SETTINGS[i];
++        Lazy l = Settings[i];
 +        entity it = l.m_get();
 +        if (returns) returns(it.tooltip);
 +        return it;
 +    }
-     METHOD(SettingSource, reload, int(string filter)) { return SETTINGS_COUNT; }
+     METHOD(SettingSource, reload, int(entity this, string filter)) { return Settings_COUNT; }
  ENDCLASS(SettingSource)
  
  #include "listbox.qc"
@@@ -53,7 -38,7 +53,7 @@@ CLASS(XonoticRegisteredSettingsList, Xo
        METHOD(XonoticRegisteredSettingsList, drawListBoxItem, void(entity this, int i, vector absSize, bool isSelected, bool isFocused))
        {
                if (!this.source) return;
-               if (!this.source.getEntry(i, XonoticRegisteredSettingsList_getNameIcon_cb)) return;
 -              if (!this.source.getEntry(this.source, i, XonoticRegisteredSettingsList_cb)) return;
++              if (!this.source.getEntry(this.source, i, XonoticRegisteredSettingsList_getNameIcon_cb)) return;
                string name = XonoticRegisteredSettingsList_cb_name;
                if (isSelected) {
                        draw_Fill('0 0 0', '1 1 0', SKINCOLOR_LISTBOX_SELECTED, SKINALPHA_LISTBOX_SELECTED);
@@@ -64,26 -49,6 +64,26 @@@
                string s = draw_TextShortenToWidth(strdecolorize(name), 1, 0, this.realFontSize);
                draw_Text(this.realUpperMargin * eY + (0.5 * this.realFontSize.x) * eX, s, this.realFontSize, '1 1 1', SKINALPHA_TEXT, 0);
        }
-               if (!this.source.getEntryTooltip(this.focusedItem, XonoticRegisteredSettingsList_getTooltip_cb))
 +
 +      METHOD(XonoticRegisteredSettingsList, focusedItemChangeNotify, void(entity this))
 +      {
 +              if (this.focusedItem == -1 || !this.source)
 +              {
 +                      clearTooltip(this);
 +                      return;
 +              }
++              if (!this.source.getEntryTooltip(this, this.focusedItem, XonoticRegisteredSettingsList_getTooltip_cb))
 +              {
 +                      clearTooltip(this);
 +                      return;
 +              }
 +              string theTooltip = XonoticRegisteredSettingsList_cb_tooltip;
 +              if(theTooltip != "")
 +                      setZonedTooltip(this, theTooltip, string_null);
 +              else
 +                      clearTooltip(this);
 +      }
 +
        METHOD(XonoticRegisteredSettingsList, refilter, void(entity this))
        {
                if (!this.source) {