thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2025-10-30 08:01:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge d_netfil.c

Browse source
This commit is contained in:
Sally Coolatta 2020-08-10 12:05:23 -04:00
parent c3ca513445
commit 4cd47a92dc
1 changed files with 0 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/d_netfil.c
View file

@ -1074,21 +1074,10 @@ void FileSendTicker(void)
M_Memcpy(p->data, &f->id.ram[transfer[i].position], fragmentsize); M_Memcpy(p->data, &f->id.ram[transfer[i].position], fragmentsize);
else else
{ {
<<<<<<< HEAD
size_t n = fread(p->data, 1, size, transfer[i].currentfile);
if (n != size) // Either an error or Windows turning CR-LF into LF
{
if (f->textmode && feof(transfer[i].currentfile))
size = n;
else if (fread(p->data, 1, size, transfer[i].currentfile) != size)
I_Error("SV_FileSendTicker: can't read %s byte on %s at %d because %s", sizeu1(size), f->id.filename, transfer[i].position, M_FileError(transfer[i].currentfile));
}
=======
fseek(transfer[i].currentfile, transfer[i].position, SEEK_SET); fseek(transfer[i].currentfile, transfer[i].position, SEEK_SET);
if (fread(p->data, 1, fragmentsize, transfer[i].currentfile) != fragmentsize) if (fread(p->data, 1, fragmentsize, transfer[i].currentfile) != fragmentsize)
I_Error("FileSendTicker: can't read %s byte on %s at %d because %s", sizeu1(fragmentsize), f->id.filename, transfer[i].position, M_FileError(transfer[i].currentfile)); I_Error("FileSendTicker: can't read %s byte on %s at %d because %s", sizeu1(fragmentsize), f->id.filename, transfer[i].position, M_FileError(transfer[i].currentfile));
>>>>>>> srb2/next
} }
p->iteration = transfer[i].iteration; p->iteration = transfer[i].iteration;
p->position = LONG(transfer[i].position); p->position = LONG(transfer[i].position);