darkplaces/gmqcc
0
0
Fork 0
mirror of https://github.com/DarkPlacesEngine/gmqcc.git synced 2025-01-31 12:00:38 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' into cleanup

Browse source
This commit is contained in:
Dale Weiler 2016-01-02 22:30:35 -05:00
commit 1a18ff5294
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
exec.cpp
View file

@ -629,7 +629,7 @@ static qcvm_parameter *main_params = nullptr;
if (prog->argc != (num)) { \
prog->vmerror++; \
fprintf(stderr, "ERROR: invalid number of arguments for %s: %i, expected %i\n", \
__FUNCTION__, prog->argc, (num)); \
__func__, prog->argc, (num)); \
return -1; \
} \
} while (0)

4
parser.cpp
View file

@ -2523,8 +2523,7 @@ static bool parse_for_go(parser_t *parser, ast_block *block, ast_expression **ou
parseerror(parser, "expected for-loop condition");
goto onerr;
}
}
else if (!parser_next(parser)) {
} else if (!parser_next(parser)) {
parseerror(parser, "expected for-loop condition");
goto onerr;
}
@ -2535,7 +2534,6 @@ static bool parse_for_go(parser_t *parser, ast_block *block, ast_expression **ou
if (!cond)
goto onerr;
}
/* move on to incrementor */
if (parser->tok != ';') {
parseerror(parser, "expected semicolon after for-loop initializer");

2
test.cpp
View file

@ -638,6 +638,8 @@ static bool task_propagate(const char *curdir, size_t *pad, const char *defs) {
const char *qcflags = nullptr;
task_t task;
memset(&task, 0, sizeof(task));
found ++;
if (!tmpl) {
con_err("error compiling task template: %s\n", files->d_name);