fte/quakespasm
2
0
Fork 0
mirror of https://github.com/Shpoike/Quakespasm.git synced 2024-11-10 07:21:58 +00:00
Code Issues Projects Releases Packages Wiki Activity

Replace manual demo cdtrack parsing with evil fscanf

Browse source 
This fixes the missing music in hipdemo1 caused by a leading space
character before the cdtrack number, which ended up being parsed
incorrectly.  https://github.com/andrei-drexler/ironwail/issues/60

Note: original issue with fscanf (mentioned in the code comments)
was caused by the inclusion of the newline in the format string.
We work around it by reading the newline character separately.
This commit is contained in:
Andrei Drexler 2022-04-02 11:50:10 +03:00 committed by Ozkan Sezer
parent ae97a7b5ed
commit 0b30541ab9
1 changed files with 1 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
Quake/cl_demo.c
View file

@ -382,8 +382,6 @@ play [demoname]
void CL_PlayDemo_f (void)
{
char name[MAX_OSPATH];
int i, c;
qboolean neg;
if (cmd_source != src_command)
return;
@ -415,24 +413,7 @@ void CL_PlayDemo_f (void)
// O.S.: if a space character e.g. 0x20 (' ') follows '\n',
// fscanf skips that byte too and screws up further reads.
// fscanf (cls.demofile, "%i\n", &cls.forcetrack);
cls.forcetrack = 0;
c = 0; /* silence pesky compiler warnings */
neg = false;
// read a decimal integer possibly with a leading '-',
// followed by a '\n':
for (i = 0; i < 13; i++)
{
c = getc(cls.demofile);
if (c == '\n')
break;
if (c == '-') {
neg = true;
continue;
}
// check for multiple '-' or legal digits? meh...
cls.forcetrack = cls.forcetrack * 10 + (c - '0');
}
if (c != '\n')
if (fscanf (cls.demofile, "%i", &cls.forcetrack) != 1 || fgetc (cls.demofile) != '\n')
{
fclose (cls.demofile);
cls.demofile = NULL;
@ -440,8 +421,6 @@ void CL_PlayDemo_f (void)
Con_Printf ("ERROR: demo \"%s\" is invalid\n", name);
return;
}
if (neg)
cls.forcetrack = -cls.forcetrack;
cls.demoplayback = true;
cls.demopaused = false;