Cube  Diff

Differences From Artifact [28e1977716]:

To Artifact [b2e734a52a]:


143
144
145
146
147
148
149
150
151


152
153

154


155
156
157
158
159
160
161
162
163
164
165
166
167














168


169
170
171
172
173
174
175
143
144
145
146
147
148
149


150
151
152

153
154
155
156













157
158
159
160
161
162
163
164
165
166
167
168
169
170

171
172
173
174
175
176
177
178
179







-
-
+
+

-
+

+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+







ENetSocket pingsock = ENET_SOCKET_NULL;
int lastinfo = 0;

char *
getservername(int n)
{
	return servers[n].name;
};

}

void
addserver(char *servername)
addserver(OFString *servername_)
{
	@autoreleasepool {
		const char *servername = servername_.UTF8String;
	loopv(servers) if (strcmp(servers[i].name, servername) == 0) return;
	serverinfo &si = servers.insert(0, serverinfo());
	strcpy_s(si.name, servername);
	si.full[0] = 0;
	si.mode = 0;
	si.numplayers = 0;
	si.ping = 9999;
	si.protocol = 0;
	si.minremain = 0;
	si.map[0] = 0;
	si.sdesc[0] = 0;
	si.address.host = ENET_HOST_ANY;
	si.address.port = CUBE_SERVINFO_PORT;
		loopv(servers) if (strcmp(servers[i].name, servername) ==
		                   0) return;
		serverinfo &si = servers.insert(0, serverinfo());
		strcpy_s(si.name, servername);
		si.full[0] = 0;
		si.mode = 0;
		si.numplayers = 0;
		si.ping = 9999;
		si.protocol = 0;
		si.minremain = 0;
		si.map[0] = 0;
		si.sdesc[0] = 0;
		si.address.host = ENET_HOST_ANY;
		si.address.port = CUBE_SERVINFO_PORT;
};
	}
}

void
pingservers()
{
	ENetBuffer buf;
	uchar ping[MAXTRANS];
	uchar *p;
310
311
312
313
314
315
316
317

318
319
320
321
322
323
324
325
326
327
328
329
330

314
315
316
317
318
319
320

321
322
323
324
325
326
327
328
329
330
331
332
333

334







-
+












-
+
	else {
		servers.setsize(0);
		execute((char *)reply);
	};
	servermenu();
}

COMMAND(addserver, ARG_1CSTR)
COMMAND(addserver, ARG_1STR)
COMMAND(servermenu, ARG_NONE)
COMMAND(updatefrommaster, ARG_NONE)

void
writeservercfg()
{
	FILE *f = fopen("servers.cfg", "w");
	if (!f)
		return;
	fprintf(f, "// servers connected to are added here automatically\n\n");
	loopvrev(servers) fprintf(f, "addserver %s\n", servers[i].name);
	fclose(f);
};
}