mirror of
https://git.code.sf.net/p/quake/quakeforge
synced 2024-11-23 12:52:46 +00:00
Don't convert a qfo to progs unnecessarily.
This avoids segfaults on reloctions for external defs.
This commit is contained in:
parent
61ef901254
commit
09d1cd61f3
1 changed files with 4 additions and 1 deletions
|
@ -126,7 +126,7 @@ static edict_t *edicts;
|
|||
static int num_edicts;
|
||||
static int reserved_edicts = 1;
|
||||
static progs_t pr;
|
||||
|
||||
static int need_progs;
|
||||
static qfo_t *qfo;
|
||||
|
||||
static const char *source_path = "";
|
||||
|
@ -314,6 +314,8 @@ load_progs (const char *name)
|
|||
if (!qfo)
|
||||
return 0;
|
||||
|
||||
if (!need_progs)
|
||||
return 1;
|
||||
convert_qfo ();
|
||||
} else {
|
||||
pr.progs_name = name;
|
||||
|
@ -401,6 +403,7 @@ main (int argc, char **argv)
|
|||
}
|
||||
init_qf ();
|
||||
while (optind < argc) {
|
||||
need_progs = !func->qfo;
|
||||
if (!load_progs (argv[optind++]))
|
||||
return 1;
|
||||
if (qfo && func->qfo)
|
||||
|
|
Loading…
Reference in a new issue