stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2024-11-28 23:21:58 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch SRB2:next into linux-customshader-compilation-fix

Browse source
This commit is contained in:
Vlad Doc 2024-04-11 19:37:12 +00:00
commit 66a5b2f22f
1 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/deh_soc.c
View file

@ -405,7 +405,6 @@ void readfreeslots(MYFILE *f)
{ {
char *s = Z_Malloc(MAXLINELEN, PU_STATIC, NULL); char *s = Z_Malloc(MAXLINELEN, PU_STATIC, NULL);
char *word,*type; char *word,*type;
char *tmp;
int i; int i;
do do
@ -415,10 +414,13 @@ void readfreeslots(MYFILE *f)
if (s[0] == '\n') if (s[0] == '\n')
break; break;
tmp = strchr(s, '#'); char *hashtag = strchr(s, '#');
if (tmp) char *space = strchr(s, ' ');
*tmp = '\0'; if (hashtag)
if (s == tmp) *hashtag = '\0';
if (space)
*space = '\0';
if (s == hashtag || s == space)
continue; // Skip comment lines, but don't break. continue; // Skip comment lines, but don't break.
type = strtok(s, "_"); type = strtok(s, "_");