Some minor cleanups and optimizations

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

diff --git a/qcsrc/menu/xonotic/gametypelist.qc b/qcsrc/menu/xonotic/gametypelist.qc
index e2fdfa8e72b60e52881c621e77f57379080c5c99..2de655940f70d124f67887fca042cb8678176f3f 100644 (file)
--- a/qcsrc/menu/xonotic/gametypelist.qc
+++ b/qcsrc/menu/xonotic/gametypelist.qc
@@ -1,30 +1,9 @@
-#ifndef GAMETYPELIST_H
-#define GAMETYPELIST_H
-#include "listbox.qc"
-CLASS(XonoticGametypeList, XonoticListBox)
-       METHOD(XonoticGametypeList, configureXonoticGametypeList, void(entity));
-       ATTRIB(XonoticGametypeList, rowsPerItem, float, 2)
-       METHOD(XonoticGametypeList, drawListBoxItem, void(entity, int, vector, bool, bool));
-       METHOD(XonoticGametypeList, resizeNotify, void(entity, vector, vector, vector, vector));
-       METHOD(XonoticGametypeList, setSelected, void(entity, float));
-       METHOD(XonoticGametypeList, loadCvars, void(entity));
-       METHOD(XonoticGametypeList, saveCvars, void(entity));
-       METHOD(XonoticGametypeList, keyDown, float(entity, float, float, float));
-       METHOD(XonoticGametypeList, clickListBoxItem, void(entity, float, vector));
+#include "gametypelist.qh"
 
-       ATTRIB(XonoticGametypeList, realFontSize, vector, '0 0 0')
-       ATTRIB(XonoticGametypeList, realUpperMargin, float, 0)
-       ATTRIB(XonoticGametypeList, columnIconOrigin, float, 0)
-       ATTRIB(XonoticGametypeList, columnIconSize, float, 0)
-       ATTRIB(XonoticGametypeList, columnNameOrigin, float, 0)
-       ATTRIB(XonoticGametypeList, columnNameSize, float, 0)
-ENDCLASS(XonoticGametypeList)
-entity makeXonoticGametypeList();
-#endif
+#include "dialog_multiplayer_create.qh"
+#include <common/mapinfo.qh>
 
-#ifdef IMPLEMENTATION
-
-entity makeXonoticGametypeList(void)
+entity makeXonoticGametypeList()
 {
        entity me;
        me = NEW(XonoticGametypeList);
@@ -38,7 +17,7 @@ void XonoticGametypeList_configureXonoticGametypeList(entity me)
 
        if(SKINBOOL_GAMETYPELIST_ICON_BLUR)
        {
-               for(int i = 0; i < GameType_GetCount(); ++i)
+               for(int i = 0; i < GameType_GetTotalCount(); ++i)
                        draw_PreloadPictureWithFlags(GameType_GetIcon(i), PRECACHE_PIC_MIPMAP);
        }
 
@@ -51,18 +30,18 @@ void XonoticGametypeList_setSelected(entity me, float i)
 }
 void XonoticGametypeList_loadCvars(entity me)
 {
-       float t;
-       t = MapInfo_CurrentGametype();
+       Gametype t = MapInfo_CurrentGametype();
+       int cnt = GameType_GetCount();
        float i;
-       for(i = 0; i < GameType_GetCount(); ++i)
+       for(i = 0; i < cnt; ++i)
                if(t == GameType_GetID(i))
                        break;
-       if(i >= GameType_GetCount())
+       if(i >= cnt)
        {
-               for(i = 0; i < GameType_GetCount(); ++i)
+               for(i = 0; i < cnt; ++i)
                        if(t == MAPINFO_TYPE_DEATHMATCH)
                                break;
-               if(i >= GameType_GetCount())
+               if(i >= cnt)
                        i = 0;
        }
        me.setSelected(me, i);
@@ -70,7 +49,7 @@ void XonoticGametypeList_loadCvars(entity me)
 }
 void XonoticGametypeList_saveCvars(entity me)
 {
-       int t = GameType_GetID(me.selectedItem);
+       Gametype t = GameType_GetID(me.selectedItem);
        if (t == MapInfo_CurrentGametype()) {
                return;
        }
@@ -80,6 +59,15 @@ void XonoticGametypeList_saveCvars(entity me)
                owner.gameTypeChangeNotify(owner);
        }
 }
+void XonoticGametypeList_draw(entity me)
+{
+       if(me.nItems != GameType_GetCount())
+       {
+               me.nItems = GameType_GetCount();
+               me.setSelected(me, 0);
+       }
+       SUPER(XonoticGametypeList).draw(me);
+}
 void XonoticGametypeList_drawListBoxItem(entity me, int i, vector absSize, bool isSelected, bool isFocused)
 {
        string s1, s2;
@@ -112,10 +100,12 @@ void XonoticGametypeList_drawListBoxItem(entity me, int i, vector absSize, bool
 void XonoticGametypeList_resizeNotify(entity me, vector relOrigin, vector relSize, vector absOrigin, vector absSize)
 {
        me.itemAbsSize = '0 0 0';
-       SUPER(XonoticServerList).resizeNotify(me, relOrigin, relSize, absOrigin, absSize);
+       SUPER(XonoticGametypeList).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.realUpperMargin = 0.5 * (1 - me.realFontSize.y);
        me.columnIconOrigin = 0;
        me.columnIconSize = me.itemAbsSize.y / me.itemAbsSize.x;
@@ -137,4 +127,10 @@ void XonoticGametypeList_clickListBoxItem(entity me, float i, vector where)
 {
        m_play_click_sound(MENU_SOUND_SELECT);
 }
-#endif
+void XonoticGametypeList_focusedItemChangeNotify(entity me)
+{
+       if(me.focusedItem >= 0)
+               setZonedTooltip(me, MapInfo_Type_Description(GameType_GetID(me.focusedItem)), string_null);
+       else
+               clearTooltip(me);
+}