Cube  Check-in [a6b2705084]

Overview
Comment:Fix accidentally dropped if statement
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA3-256: a6b27050840a017db78c30418d5417252f478685c687408dfe8f99fd6eaf9117
User & Date: js on 2025-03-15 23:05:30
Other Links: manifest | tags
Context
2025-03-15
23:10
Run the run loop check-in: 9e7cb01dd0 user: js tags: trunk
23:05
Fix accidentally dropped if statement check-in: a6b2705084 user: js tags: trunk
12:05
More string migrations check-in: d0e460fce1 user: js tags: trunk
Changes

Modified src/server.mm from [f2cdc4d59c] to [7081fc19b8].

203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
	}

	uchar *end = packet->data + packet->dataLength;
	uchar *p = packet->data + 2;
	char text[MAXTRANS];
	int cn = -1, type;

	while (p < end)
		switch (type = getint(p)) {
		case SV_TEXT:
			sgetstr();
			break;

		case SV_INITC2S:
			sgetstr();
			@autoreleasepool {







|
|







203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
	}

	uchar *end = packet->data + packet->dataLength;
	uchar *p = packet->data + 2;
	char text[MAXTRANS];
	int cn = -1, type;

	while (p < end) {
		switch ((type = getint(p))) {
		case SV_TEXT:
			sgetstr();
			break;

		case SV_INITC2S:
			sgetstr();
			@autoreleasepool {
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313

314
315
316
317
318

319
320
321
322
323
324
325
			return;
		}

		case SV_RECVMAP:
			send(sender, recvmap(sender));
			return;

		case SV_EXT: // allows for new features that require no server
		             // updates
		{
			for (int n = getint(p); n; n--)
				getint(p);
			break;
		}

		default: {
			int size = msgsizelookup(type);
			if (size == -1) {
				disconnect_client(sender, @"tag type");
				return;
			}
			loopi(size - 1) getint(p);
		}
		}


	if (p > end) {
		disconnect_client(sender, @"end of packet");
		return;
	}

	multicast(packet, sender);
}

void
send_welcome(int n)
{
	ENetPacket *packet =







|
|
<



<










>





>







290
291
292
293
294
295
296
297
298

299
300
301

302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
			return;
		}

		case SV_RECVMAP:
			send(sender, recvmap(sender));
			return;

		// allows for new features that require no server updates
		case SV_EXT:

			for (int n = getint(p); n; n--)
				getint(p);
			break;


		default: {
			int size = msgsizelookup(type);
			if (size == -1) {
				disconnect_client(sender, @"tag type");
				return;
			}
			loopi(size - 1) getint(p);
		}
		}
	}

	if (p > end) {
		disconnect_client(sender, @"end of packet");
		return;
	}

	multicast(packet, sender);
}

void
send_welcome(int n)
{
	ENetPacket *packet =
348
349
350
351
352
353
354

355
356
357
358
359
360
361

362
363
364
365
366
367
368
369
}

void
multicast(ENetPacket *packet, int sender)
{
	size_t count = clients.count;
	for (size_t i = 0; i < count; i++)

		send(i, packet);
}

void
localclienttoserver(ENetPacket *packet)
{
	process(packet, 0);

	if (!packet->referenceCount)
		enet_packet_destroy(packet);
}

Client *
addclient()
{
	for (Client *client in clients)







>
|






>
|







348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
}

void
multicast(ENetPacket *packet, int sender)
{
	size_t count = clients.count;
	for (size_t i = 0; i < count; i++)
		if (i != sender)
			send(i, packet);
}

void
localclienttoserver(ENetPacket *packet)
{
	process(packet, 0);

	if (packet->referenceCount == 0)
		enet_packet_destroy(packet);
}

Client *
addclient()
{
	for (Client *client in clients)