X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fmenu%2Fxonotic%2Fserverlist.qc;h=b781ff6819b55055b52d06d5288b0a32e3bf4bd1;hb=7f7ee19875849309c6778d76d870d9bb82f14d37;hp=c8346fff80dbcc5c7ca09ff05d81ef7198ec0b8d;hpb=a73f79e356dd25b6ea678379e7884ee45cc1977b;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/menu/xonotic/serverlist.qc b/qcsrc/menu/xonotic/serverlist.qc index c8346fff8..b781ff681 100644 --- a/qcsrc/menu/xonotic/serverlist.qc +++ b/qcsrc/menu/xonotic/serverlist.qc @@ -27,32 +27,33 @@ 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) \ { \ - strunzone(categories[i].override_string); \ - categories[i].override_string = string_null; \ + strfree(categories[i].override_string); \ categories[i].override_field = catnum; \ continue; \ } \ else \ { \ LOG_INFOF( \ - "RegisterSLCategories(): Improper override '%s' for category '%s'!\n", \ + "RegisterSLCategories(): Improper override '%s' for category '%s'!", \ s, \ categories[i].cat_name \ ); \ } \ } \ - strunzone(categories[i].override_string); \ - categories[i].override_string = string_null; \ + strfree(categories[i].override_string); \ categories[i].override_field = 0; \ } PROCESS_OVERRIDE(cat_enoverride_string, cat_enoverride) @@ -308,9 +309,7 @@ void XonoticServerList_setSelected(entity me, int i) if(gethostcachevalue(SLIST_HOSTCACHEVIEWCOUNT) != me.nItems) return; // sorry, it would be wrong - if(me.selectedServer) - strunzone(me.selectedServer); - me.selectedServer = strzone(gethostcachestring(SLIST_FIELD_CNAME, me.selectedItem)); + strcpy(me.selectedServer, gethostcachestring(SLIST_FIELD_CNAME, me.selectedItem)); me.ipAddressBox.setText(me.ipAddressBox, me.selectedServer); me.ipAddressBox.cursorPos = strlen(me.selectedServer); @@ -471,9 +470,8 @@ void XonoticServerList_draw(entity me) // entire list, otherwise there is no way to know which item is first in its category. // binary search method suggested by div - float x; float begin = 0; - for(x = 1; x <= category_ent_count; ++x) { + for(int j = 1; j <= category_ent_count; ++j) { float first = begin; float last = (itemcount - 1); if (first > last) { @@ -482,42 +480,42 @@ void XonoticServerList_draw(entity me) } float catf = gethostcachenumber(SLIST_FIELD_CATEGORY, first); float catl = gethostcachenumber(SLIST_FIELD_CATEGORY, last); - if (catf > x) { - // The first one is already > x. - // Therefore, category x does not exist. + if (catf > j) { + // The first one is already > j. + // Therefore, category j does not exist. // Higher numbered categories do exist though. - } else if (catl < x) { - // The last one is < x. + } else if (catl < j) { + // The last one is < j. // Thus this category - and any following - // don't exist. break; - } else if (catf == x) { + } else if (catf == j) { // Starts at first. This breaks the loop // invariant in the binary search and thus has // to be handled separately. - if(gethostcachenumber(SLIST_FIELD_CATEGORY, first) != x) + if(gethostcachenumber(SLIST_FIELD_CATEGORY, first) != j) error("Category mismatch I"); if(first > 0) - if(gethostcachenumber(SLIST_FIELD_CATEGORY, first - 1) == x) + if(gethostcachenumber(SLIST_FIELD_CATEGORY, first - 1) == j) error("Category mismatch II"); - category_name[category_draw_count] = x; + category_name[category_draw_count] = j; category_item[category_draw_count] = first; ++category_draw_count; begin = first + 1; } else { - // At this point, catf <= x < catl, thus + // At this point, catf <= j < catl, thus // catf < catl, thus first < last. // INVARIANTS: // last - first >= 1 // catf == gethostcachenumber(SLIST_FIELD_CATEGORY(first) // catl == gethostcachenumber(SLIST_FIELD_CATEGORY(last) - // catf < x - // catl >= x + // catf < j + // catl >= j while (last - first > 1) { float middle = floor((first + last) / 2); // By loop condition, middle != first && middle != last. float cat = gethostcachenumber(SLIST_FIELD_CATEGORY, middle); - if (cat >= x) { + if (cat >= j) { last = middle; catl = cat; } else { @@ -525,13 +523,13 @@ void XonoticServerList_draw(entity me) catf = cat; } } - if (catl == x) { - if(gethostcachenumber(SLIST_FIELD_CATEGORY, last) != x) + if (catl == j) { + if(gethostcachenumber(SLIST_FIELD_CATEGORY, last) != j) error("Category mismatch III"); if(last > 0) - if(gethostcachenumber(SLIST_FIELD_CATEGORY, last - 1) == x) + if(gethostcachenumber(SLIST_FIELD_CATEGORY, last - 1) == j) error("Category mismatch IV"); - category_name[category_draw_count] = x; + category_name[category_draw_count] = j; category_item[category_draw_count] = last; ++category_draw_count; begin = last + 1; // already scanned through these, skip 'em @@ -550,9 +548,10 @@ void XonoticServerList_draw(entity me) } else { me.nItems = gethostcachevalue(SLIST_HOSTCACHEVIEWCOUNT); } - me.connectButton.disabled = ((me.nItems == 0) && (me.ipAddressBox.text == "")); - me.infoButton.disabled = ((me.nItems == 0) || !owned); - me.favoriteButton.disabled = ((me.nItems == 0) && (me.ipAddressBox.text == "")); + 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 == "")); if(me.lockedSelectedItem) { @@ -560,9 +559,7 @@ void XonoticServerList_draw(entity me) { if(gethostcachestring(SLIST_FIELD_CNAME, me.selectedItem) != me.selectedServer) { - if(me.selectedServer) - strunzone(me.selectedServer); - me.selectedServer = strzone(gethostcachestring(SLIST_FIELD_CNAME, me.selectedItem)); + strcpy(me.selectedServer, gethostcachestring(SLIST_FIELD_CNAME, me.selectedItem)); } found = true; } @@ -587,9 +584,7 @@ void XonoticServerList_draw(entity me) // selected server disappeared, select the last server (scrolling to it) if(me.selectedItem >= me.nItems) SUPER(XonoticServerList).setSelected(me, me.nItems - 1); - if(me.selectedServer) - strunzone(me.selectedServer); - me.selectedServer = strzone(gethostcachestring(SLIST_FIELD_CNAME, me.selectedItem)); + strcpy(me.selectedServer, gethostcachestring(SLIST_FIELD_CNAME, me.selectedItem)); } } @@ -667,12 +662,9 @@ void ServerList_TypeSort_Click(entity btn, entity me) } void ServerList_Filter_Change(entity box, entity me) { - if(me.filterString) - strunzone(me.filterString); + strfree(me.filterString); if(box.text != "") me.filterString = strzone(box.text); - else - me.filterString = string_null; me.refreshServerList(me, REFRESHSERVERLIST_REFILTER); me.ipAddressBox.setText(me.ipAddressBox, ""); @@ -718,9 +710,7 @@ void XonoticServerList_setSortOrder(entity me, int fld, int direction) me.sortButton4.forcePressed = 0; me.sortButton5.forcePressed = (fld == SLIST_FIELD_NUMHUMANS); me.selectedItem = 0; - if(me.selectedServer) - strunzone(me.selectedServer); - me.selectedServer = string_null; + strfree(me.selectedServer); me.refreshServerList(me, REFRESHSERVERLIST_REFILTER); } void XonoticServerList_positionSortButton(entity me, entity btn, float theOrigin, float theSize, string theTitle, void(entity, entity) theFunc) @@ -762,7 +752,7 @@ void XonoticServerList_resizeNotify(entity me, vector relOrigin, vector relSize, me.columnPlayersOrigin = me.columnTypeOrigin + me.columnTypeSize + me.realFontSize.x; me.positionSortButton(me, me.sortButton1, me.columnPingOrigin, me.columnPingSize, _("Ping"), ServerList_PingSort_Click); - me.positionSortButton(me, me.sortButton2, me.columnNameOrigin, me.columnNameSize, _("Host name"), ServerList_NameSort_Click); + me.positionSortButton(me, me.sortButton2, me.columnNameOrigin, me.columnNameSize, _("Hostname"), ServerList_NameSort_Click); me.positionSortButton(me, me.sortButton3, me.columnMapOrigin, me.columnMapSize, _("Map"), ServerList_MapSort_Click); me.positionSortButton(me, me.sortButton4, me.columnTypeOrigin, me.columnTypeSize, _("Type"), ServerList_TypeSort_Click); me.positionSortButton(me, me.sortButton5, me.columnPlayersOrigin, me.columnPlayersSize, _("Players"), ServerList_PlayerSort_Click); @@ -776,11 +766,10 @@ void XonoticServerList_resizeNotify(entity me, vector relOrigin, vector relSize, } void ServerList_Connect_Click(entity btn, entity me) { - localcmd(sprintf("connect %s\n", - ((me.ipAddressBox.text != "") ? - me.ipAddressBox.text : me.selectedServer - ) - )); + if (me.lockedSelectedItem) + return; + string sv = (me.ipAddressBox.text != "") ? me.ipAddressBox.text : me.selectedServer; + localcmd(sprintf("connect %s\n", sv)); } void ServerList_Favorite_Click(entity btn, entity this) { @@ -858,7 +847,7 @@ void XonoticServerList_drawListBoxItem(entity me, int i, vector absSize, bool is } } - if(isSelected) + if(isSelected && !me.lockedSelectedItem) draw_Fill('0 0 0', '1 1 0', SKINCOLOR_LISTBOX_SELECTED, SKINALPHA_LISTBOX_SELECTED); else if(isFocused) { @@ -961,7 +950,7 @@ void XonoticServerList_drawListBoxItem(entity me, int i, vector absSize, bool is isv6 = true; me.seenIPv6 += 1; } - else if(strstrofs("0123456789", substring(s, 0, 1), 0) >= 0) + else if(IS_DIGIT(substring(s, 0, 1))) { isv4 = true; me.seenIPv4 += 1;