mirror of
https://git.do.srb2.org/STJr/SRB2.git
synced 2024-11-25 05:41:42 +00:00
Merge branch SRB2:next into linux-customshader-compilation-fix
This commit is contained in:
commit
66a5b2f22f
1 changed files with 7 additions and 5 deletions
|
@ -405,7 +405,6 @@ void readfreeslots(MYFILE *f)
|
|||
{
|
||||
char *s = Z_Malloc(MAXLINELEN, PU_STATIC, NULL);
|
||||
char *word,*type;
|
||||
char *tmp;
|
||||
int i;
|
||||
|
||||
do
|
||||
|
@ -415,10 +414,13 @@ void readfreeslots(MYFILE *f)
|
|||
if (s[0] == '\n')
|
||||
break;
|
||||
|
||||
tmp = strchr(s, '#');
|
||||
if (tmp)
|
||||
*tmp = '\0';
|
||||
if (s == tmp)
|
||||
char *hashtag = strchr(s, '#');
|
||||
char *space = strchr(s, ' ');
|
||||
if (hashtag)
|
||||
*hashtag = '\0';
|
||||
if (space)
|
||||
*space = '\0';
|
||||
if (s == hashtag || s == space)
|
||||
continue; // Skip comment lines, but don't break.
|
||||
|
||||
type = strtok(s, "_");
|
||||
|
|
Loading…
Reference in a new issue