mirror of
https://git.code.sf.net/p/quake/quakeforge
synced 2024-11-26 14:20:59 +00:00
start merging in "map2" (quest) support
This commit is contained in:
parent
06dc22af3d
commit
ab2aa3ae92
1 changed files with 28 additions and 18 deletions
|
@ -118,39 +118,49 @@ StartTokenParsing (char *data)
|
|||
}
|
||||
|
||||
static qboolean
|
||||
GetToken (qboolean crossline)
|
||||
TokenAvailable (qboolean crossline)
|
||||
{
|
||||
char *token_p;
|
||||
|
||||
if (unget) // is a token allready waiting?
|
||||
if (unget)
|
||||
return true;
|
||||
|
||||
// skip space
|
||||
skipspace:
|
||||
while (*script_p <= 32) {
|
||||
if (!*script_p) {
|
||||
if (!crossline)
|
||||
Sys_Error ("Line %i is incomplete", scriptline);
|
||||
if (!*script_p)
|
||||
return false;
|
||||
}
|
||||
if (*script_p++ == '\n') {
|
||||
if (!crossline)
|
||||
Sys_Error ("Line %i is incomplete", scriptline);
|
||||
return false;
|
||||
scriptline++;
|
||||
}
|
||||
}
|
||||
|
||||
if (script_p[0] == '/' && script_p[1] == '/') { // comment field
|
||||
while (*script_p && *script_p != '\n')
|
||||
script_p++;
|
||||
if (!*script_p)
|
||||
return false;
|
||||
if (!crossline)
|
||||
Sys_Error ("Line %i is incomplete\n", scriptline);
|
||||
while (*script_p++ != '\n')
|
||||
if (!*script_p) {
|
||||
return false;
|
||||
scriptline++;
|
||||
goto skipspace;
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
static qboolean
|
||||
GetToken (qboolean crossline)
|
||||
{
|
||||
char *token_p;
|
||||
|
||||
if (unget) { // is a token allready waiting?
|
||||
unget = false;
|
||||
return true;
|
||||
}
|
||||
|
||||
if (!TokenAvailable (crossline)) {
|
||||
if (!crossline)
|
||||
Sys_Error ("Line %i is incomplete", scriptline);
|
||||
return false;
|
||||
}
|
||||
goto skipspace;
|
||||
}
|
||||
|
||||
// copy token
|
||||
token_p = token;
|
||||
|
|
Loading…
Reference in a new issue