#include "dialog_multiplayer_join_serverinfo.qh"
#include <common/mapinfo.qh>
+#define IsFavorite(srv) IsServerInList(cvar_string("net_slist_favorites"), srv)
+#define IsPromoted(srv) IsServerInList(_Nex_ExtResponseSystem_PromotedServers, srv)
+#define IsRecommended(srv) IsServerInList(_Nex_ExtResponseSystem_RecommendedServers, srv)
+
+float m_gethostcachecategory(float entry) { return CategoryOverride(CategoryForEntry(entry)); }
+
void SL_ProcessCategoryOverrides(.string override_field_string, .float override_field)
{
for (int i = 0; i < category_ent_count; ++i)
void XonoticServerList_draw(entity me)
{
+ me.serversHeight = (autocvar_menu_slist_categories > 0 ? 1.0 : me.categoriesHeight);
+
if(_Nex_ExtResponseSystem_BannedServersNeedsRefresh)
{
if(!me.needsRefresh)
for(int i = 0; i < category_draw_count; ++i) { category_name[i] = -1; category_item[i] = -1; }
category_draw_count = 0;
+ me.nItems = gethostcachevalue(SLIST_HOSTCACHEVIEWCOUNT);
+
if(autocvar_menu_slist_categories >= 0) // if less than 0, don't even draw a category heading for favorites
{
- float itemcount = gethostcachevalue(SLIST_HOSTCACHEVIEWCOUNT);
- me.nItems = itemcount;
+ int itemcount = me.nItems;
//float visible = floor(me.scrollPos / me.itemHeight);
// ^ unfortunately no such optimization can be made-- we must process through the
me.nItems = itemcount;
}
}
- else { me.nItems = gethostcachevalue(SLIST_HOSTCACHEVIEWCOUNT); }
me.connectButton.disabled = (me.ipAddressBox.text == "");
me.infoButton.disabled = !owned;
if (me.nItems != 0)
main.serverInfoDialog.loadServerInfo(main.serverInfoDialog, me.selectedItem);
- vector org = boxToGlobal(eY * (me.selectedItem * me.itemHeight - me.scrollPos), me.origin, me.size);
- vector sz = boxToGlobalSize(eY * me.itemHeight + eX * (1 - me.controlWidth), me.size);
+ float thisPos = me.getItemStart(me, me.selectedItem);
+ float thisHeight = me.getItemHeight(me, me.selectedItem);
+ vector org = boxToGlobal(eY * (thisPos - me.scrollPos), me.origin, me.size);
+ vector sz = boxToGlobalSize(eY * thisHeight + eX * (1 - me.controlWidth), me.size);
DialogOpenButton_Click_withCoords(me, main.serverInfoDialog, org, sz);
}
void XonoticServerList_doubleClickListBoxItem(entity me, int i, vector where)
vector oldscale = draw_scale;
vector oldshift = draw_shift;
#define SET_YRANGE(start,end) \
- draw_scale = boxToGlobalSize(eX + eY * (end - start), oldscale); \
- draw_shift = boxToGlobal(eY * start, oldshift, oldscale);
+ draw_scale = boxToGlobalSize(eX + eY * ((end) - (start)), oldscale); \
+ draw_shift = boxToGlobal(eY * (start), oldshift, oldscale);
int c;
for (c = 0; c < category_draw_count; ++c) {
}
}
+ // Now categories are done. Set the Y range in stone.
+ oldscale = draw_scale;
+ oldshift = draw_shift;
+
if(isSelected && !me.lockedSelectedItem)
draw_Fill('0 0 0', '1 1 0', SKINCOLOR_LISTBOX_SELECTED, SKINALPHA_LISTBOX_SELECTED);
else if(isFocused)
// --------------
vector iconSize = '0 0 0';
iconSize_y = me.realFontSize.y * me.iconsSizeFactor;
- iconSize_x = me.realFontSize.x * me.iconsSizeFactor;
+ iconSize_x = me.realFontSize.x * me.iconsSizeFactor * me.serversHeight;
vector iconPos = '0 0 0';
iconPos_x = (me.columnIconsSize - 3 * iconSize.x) * 0.5;
// Stats
if(sflags >= 0 && (sflags & SERVERFLAG_PLAYERSTATS))
- draw_Picture(iconPos, "icon_stats1", iconSize, '1 1 1', 1);
+ {
+ if (sflags & SERVERFLAG_PLAYERSTATS_CUSTOM)
+ draw_Picture(iconPos, "icon_mod_", iconSize, '1 1 1', 1); // TODO: custom stats server icon
+ else
+ draw_Picture(iconPos, "icon_stats1", iconSize, '1 1 1', 1);
+ }
if(isFocused && me.mouseOverIcons && !me.tooltip)
{
if(pure_available)
t = strcat(t, sprintf(" (%s)", (pure) ? _("official settings") : _("modified settings")));
t = strcat(t, ", ");
- t = strcat(t, ((sflags >= 0 && (sflags & SERVERFLAG_PLAYERSTATS)) ? _("stats enabled") : _("stats disabled")));
+ t = strcat(t, ((sflags >= 0 && (sflags & SERVERFLAG_PLAYERSTATS)) ? ((sflags & SERVERFLAG_PLAYERSTATS_CUSTOM) ? _("custom stats server") : _("stats enabled")) : _("stats disabled")));
setZonedTooltip(me, t, string_null);
}
// --------------
// RENDER TEXT
// --------------
+ // Center it in the row.
+ SET_YRANGE(
+ 0.5 - 0.5 / me.serversHeight,
+ 0.5 + 0.5 / me.serversHeight
+ );
+
// ping
s = ftos(ping);
draw_Text(me.realUpperMargin * eY + (me.columnPingOrigin + me.columnPingSize - draw_TextWidth(s, 0, me.realFontSize)) * eX, s, me.realFontSize, theColor, theAlpha, 0);
{
if(me.nItems != 0)
{
- vector org = boxToGlobal(eY * (me.selectedItem * me.itemHeight - me.scrollPos), me.origin, me.size);
- vector sz = boxToGlobalSize(eY * me.itemHeight + eX * (1 - me.controlWidth), me.size);
+ float thisPos = me.getItemStart(me, me.selectedItem);
+ float thisHeight = me.getItemHeight(me, me.selectedItem);
+ vector org = boxToGlobal(eY * (thisPos - me.scrollPos), me.origin, me.size);
+ vector sz = boxToGlobalSize(eY * thisHeight + eX * (1 - me.controlWidth), me.size);
m_play_click_sound(MENU_SOUND_OPEN);
main.serverInfoDialog.loadServerInfo(main.serverInfoDialog, me.selectedItem);
DialogOpenButton_Click_withCoords(me, main.serverInfoDialog, org, sz);
{
float num_normal_rows = me.nItems;
int num_headers = category_draw_count;
- return me.itemHeight * (num_normal_rows + me.categoriesHeight * num_headers);
+ return me.itemHeight * (me.serversHeight * num_normal_rows + me.categoriesHeight * num_headers);
}
int XonoticServerList_getItemAtPos(entity me, float pos)
{
pos = pos / me.itemHeight;
for (int i = category_draw_count - 1; i >= 0; --i) {
int itemidx = category_item[i];
- float itempos = i * me.categoriesHeight + category_item[i];
- if (pos >= itempos + me.categoriesHeight + 1)
- return itemidx + 1 + floor(pos - (itempos + me.categoriesHeight + 1));
+ float itempos = i * me.categoriesHeight + itemidx * me.serversHeight;
+ if (pos >= itempos + me.categoriesHeight + me.serversHeight)
+ return itemidx + 1 + floor((pos - (itempos + me.categoriesHeight + me.serversHeight)) / me.serversHeight);
if (pos >= itempos)
return itemidx;
}
// No category matches? Note that category 0 is... 0. Therefore no headings exist at all.
- return floor(pos);
+ return floor(pos / me.serversHeight);
}
float XonoticServerList_getItemStart(entity me, int item)
{
for (int i = category_draw_count - 1; i >= 0; --i) {
int itemidx = category_item[i];
- float itempos = i * me.categoriesHeight + category_item[i];
+ float itempos = i * me.categoriesHeight + itemidx * me.serversHeight;
if (item >= itemidx + 1)
- return (itempos + me.categoriesHeight + 1 + item - (itemidx + 1)) * me.itemHeight;
+ return (itempos + me.categoriesHeight + (1 + item - (itemidx + 1)) * me.serversHeight) * me.itemHeight;
if (item >= itemidx)
return itempos * me.itemHeight;
}
// No category matches? Note that category 0 is... 0. Therefore no headings exist at all.
- return item * me.itemHeight;
+ return item * me.serversHeight * me.itemHeight;
}
float XonoticServerList_getItemHeight(entity me, int item)
{
for (int i = 0; i < category_draw_count; ++i) {
// Matches exactly the headings with increased height.
+ // FIXME server row next to the heading is slightly smaller than others if (autocvar_menu_slist_categories <= 0)
if (item == category_item[i])
- return me.itemHeight * (me.categoriesHeight + 1);
+ return me.itemHeight * (me.categoriesHeight + me.serversHeight);
}
- return me.itemHeight;
+ return me.itemHeight * me.serversHeight;
}
projects / xonotic / xonotic-data.pk3dir.git / blobdiff