Some minor optimizations

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

diff --git a/qcsrc/menu/xonotic/serverlist.qc b/qcsrc/menu/xonotic/serverlist.qc
index 503a975c326fe09ba82aab79ac0b5131d6cb41a5..87c8852a988691e848a20c753501a9a174e445df 100644 (file)
--- a/qcsrc/menu/xonotic/serverlist.qc
+++ b/qcsrc/menu/xonotic/serverlist.qc
@@ -27,14 +27,17 @@ void RegisterSLCategories()
                for(i = 0; i < category_ent_count; ++i) \
                { \
                        s = categories[i].override_string; \
-                       if((s != "") && (s != categories[i].cat_name)) \
+                       if(s != "" && s != categories[i].cat_name) \
                        { \
                                catnum = 0; \
                                for(x = 0; x < category_ent_count; ++x) \
-                               { if(categories[x].cat_name == s) { \
-                                       catnum = (x+1); \
-                                       break; \
-                               } } \
+                               { \
+                                       if(categories[x].cat_name == s) \
+                                       { \
+                                               catnum = x + 1; \
+                                               break; \
+                                       } \
+                               } \
                                if(catnum) \
                                { \
                                        strfree(categories[i].override_string); \
@@ -546,6 +549,7 @@ void XonoticServerList_draw(entity me)
        else { me.nItems = gethostcachevalue(SLIST_HOSTCACHEVIEWCOUNT); }
 
        me.connectButton.disabled = (me.lockedSelectedItem || (me.nItems == 0 && me.ipAddressBox.text == ""));
+       me.disconnectButton.disabled = (!(gamestatus & (GAME_ISSERVER | GAME_CONNECTED)));
        me.infoButton.disabled = (me.lockedSelectedItem || me.nItems == 0 || !owned);
        me.favoriteButton.disabled = (me.lockedSelectedItem || (me.nItems == 0 && me.ipAddressBox.text == ""));
 
@@ -806,7 +810,7 @@ void XonoticServerList_drawListBoxItem(entity me, int i, vector absSize, bool is
        vector oldscale = draw_scale;
        vector oldshift = draw_shift;
 #define SET_YRANGE(start,end) \
-       draw_scale = boxToGlobalSize(eX * 1 + eY * (end - start), oldscale); \
+       draw_scale = boxToGlobalSize(eX + eY * (end - start), oldscale); \
        draw_shift = boxToGlobal(eY * start, oldshift, oldscale);
 
        for (j = 0; j < category_draw_count; ++j) {