js/Cube
1
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Clean up file handling

Browse source 
FossilOrigin-Name: 3d55e077f74fc1c036e856cc4fdf0ae3c308c58f7d37eb9392f1a15f10cc237d
This commit is contained in:
Jonathan Schleifer 2025-03-05 21:29:54 +00:00
parent c6eebefd77
commit ab582d3745
14 changed files with 278 additions and 231 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/clientextras.mm
View file

@ -169,8 +169,8 @@ sendmap(OFString *mapname)
changemap(mapname);
mapname = getclientmap();
int mapsize;
uchar *mapdata = readmap(mapname.UTF8String, &mapsize);
if (!mapdata)
OFData *mapdata = readmap(mapname);
if (mapdata == nil)
return;
ENetPacket *packet = enet_packet_create(
NULL, MAXTRANS + mapsize, ENET_PACKET_FLAG_RELIABLE);
@ -179,16 +179,14 @@ sendmap(OFString *mapname)
putint(p, SV_SENDMAP);
sendstring(mapname.UTF8String, p);
putint(p, mapsize);
if (65535 - (p - start) < mapsize) {
if (65535 - (p - start) < mapdata.count) {
conoutf(
@"map %s is too large to send", mapname.UTF8String);
free(mapdata);
enet_packet_destroy(packet);
return;
};
memcpy(p, mapdata, mapsize);
}
memcpy(p, mapdata.items, mapdata.count);
p += mapsize;
free(mapdata);
*(ushort *)start = ENET_HOST_TO_NET_16(p - start);
enet_packet_resize(packet, p - start);
sendpackettoserv(packet);