Cube  Diff

Differences From Artifact [23e77d6100]:

To Artifact [c6e27aadf2]:


141
142
143
144
145
146
147
148

149
150

151


152
153
154
155
156
157
158
141
142
143
144
145
146
147

148
149
150
151

152
153
154
155
156
157
158
159
160







-
+


+
-
+
+







	ENetAddress address;
};

vector<serverinfo> servers;
ENetSocket pingsock = ENET_SOCKET_NULL;
int lastinfo = 0;

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

void
addserver(OFString *servername_)
{
	@autoreleasepool {
		const char *servername = servername_.UTF8String;
268
269
270
271
272
273
274
275
276
277
278
279










280
281
282
283
284
285
286
270
271
272
273
274
275
276





277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293







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







	loopv(servers)
	{
		serverinfo &si = servers[i];
		if (si.address.host != ENET_HOST_ANY && si.ping != 9999) {
			if (si.protocol != PROTOCOL_VERSION)
				sprintf_s(si.full)(
				    "%s [different cube protocol]", si.name);
			else
				sprintf_s(si.full)("%d\t%d\t%s, %s: %s %s",
				    si.ping, si.numplayers,
				    si.map[0] ? si.map : "[unknown]",
				    modestr(si.mode), si.name, si.sdesc);
			else {
				@autoreleasepool {
					sprintf_s(si.full)(
					    "%d\t%d\t%s, %s: %s %s", si.ping,
					    si.numplayers,
					    si.map[0] ? si.map : "[unknown]",
					    modestr(si.mode).UTF8String,
					    si.name, si.sdesc);
				}
			}
		} else {
			sprintf_s(si.full)(
			    si.address.host != ENET_HOST_ANY
			        ? "%s [waiting for server response]"
			        : "%s [unknown host]\t",
			    si.name);
		}