fix portal lighting in a single cluster map (box map)

[xonotic/darkplaces.git] / netconn.c

diff --git a/netconn.c b/netconn.c
index 5f64acd2572a414d74aa9be562f72d467a736513..09aadd57201bcf2920184ab57f5b25f4586ec3f8 100755 (executable)
--- a/netconn.c
+++ b/netconn.c
@@ -35,9 +35,9 @@ static cvar_t sv_masters [] =
        {CVAR_SAVE, "sv_master2", ""},
        {CVAR_SAVE, "sv_master3", ""},
        {CVAR_SAVE, "sv_master4", ""},
-       {0, "sv_masterextra1", "69.59.212.88"}, // ghdigital.com
-       {0, "sv_masterextra2", "66.169.205.13"}, // dpmaster.deathmask.net
-       {0, "sv_masterextra3", "12.166.196.192"}, // blaze.mindphukd.org
+       {0, "sv_masterextra1", "ghdigital.com"}, //69.59.212.88
+       {0, "sv_masterextra2", "dpmaster.deathmask.net"}, //209.164.24.243
+       {0, "sv_masterextra3", "12.166.196.192"}, //blaze.mindphukd.org (doesn't resolve currently but works as an ip)
        {0, NULL, NULL}
 };
 
@@ -186,6 +186,8 @@ static qboolean _ServerList_CompareInt( int A, serverlist_maskop_t op, int B )
                case SLMO_NOTEQUAL:
                        return A != B;
                case SLMO_GREATEREQUAL:
+               case SLMO_CONTAINS:
+               case SLMO_NOTCONTAIN:
                        return A >= B;
                default:
                        Con_DPrint( "_ServerList_CompareInt: Bad op!\n" );
@@ -332,7 +334,7 @@ static void _ServerList_Test(void)
 {
        int i;
        for( i = 0 ; i < 1024 ; i++ ) {
-               memset( &serverlist_cache[serverlist_cachecount], 0, sizeof( serverlist_t ) );
+               memset( &serverlist_cache[serverlist_cachecount], 0, sizeof( serverlist_entry_t ) );
                serverlist_cache[serverlist_cachecount].info.ping = rand() % 450 + 250;
                dpsnprintf( serverlist_cache[serverlist_cachecount].info.name, 128, "Black's ServerList Test %i", i );
                serverlist_cache[serverlist_cachecount].finished = true;