Merge remote-tracking branch 'origin/divVerent/allow-override-item-model'

[xonotic/xonotic-data.pk3dir.git] / qcsrc / menu / xonotic / dialog_multiplayer_join_serverinfo.c

diff --git a/qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.c b/qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.c
index d396e7bbcc747a449a2cd482c743ca5564b0d582..8bf090fe4b7320062c97628fff5427d8651f6f62 100644 (file)
--- a/qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.c
+++ b/qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.c
@@ -56,7 +56,7 @@ void Join_Click(entity btn, entity me);
 #ifdef IMPLEMENTATION
 void XonoticServerInfoDialog_loadServerInfo(entity me, float i)
 {
-       float m, pure, freeslots, j, numh, maxp, numb;
+       float m, pure, freeslots, j, numh, maxp, numb, sflags;
        string s, typestr, versionstr, k, v;
 
        if(me.currentServerName)
@@ -124,6 +124,7 @@ void XonoticServerInfoDialog_loadServerInfo(entity me, float i)
                versionstr = argv(1);
        }
        freeslots = -1;
+       sflags = -1;
        for(j = 2; j < m; ++j)
        {
                if(argv(j) == "")
@@ -134,6 +135,8 @@ void XonoticServerInfoDialog_loadServerInfo(entity me, float i)
                        pure = stof(v);
                else if(k == "S")
                        freeslots = stof(v);
+               else if(k == "F")
+                       sflags = stof(v);
        }
 
        me.currentServerType = strzone(typestr);