From 4bfdc546de34ad92fe514f07ec1934576f23931b Mon Sep 17 00:00:00 2001 From: Spoike Date: Sat, 4 Mar 2017 19:42:12 +0000 Subject: [PATCH] git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@5068 fc73d0e0-1445-4013-8a0c-d673dee63da5 --- engine/client/m_download.c | 6 +++--- engine/qclib/qccmain.c | 3 --- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/engine/client/m_download.c b/engine/client/m_download.c index 0901a4f63..de04ee577 100644 --- a/engine/client/m_download.c +++ b/engine/client/m_download.c @@ -348,7 +348,7 @@ void PM_ValidatePackage(package_t *p) } } } - if (o && o->qhash && p->qhash && (o->flags & DPF_CACHED) || fl == DPF_CACHED) + if ((o && o->qhash && p->qhash && (o->flags & DPF_CACHED)) || fl == DPF_CACHED) p->flags |= DPF_CACHED; else if (!o) { @@ -2122,7 +2122,7 @@ void PM_ManifestPackage(const char *metaname, int security) { domanifestinstall = security; Z_Free(manifestpackage); - if (metaname) + if (metaname && security) { manifestpackage = Z_StrDup(metaname); if (security) @@ -2424,7 +2424,7 @@ void PM_Command_f (void) void PM_LoadPackages(searchpath_t **oldpaths, const char *parent_pure, const char *parent_logical, searchpath_t *search, unsigned int loadstuff, int minpri, int maxpri) { } -void PM_ManifestPackage(const char *metaname, qboolean mark) +void PM_ManifestPackage(const char *metaname, int security) { } void PM_Shutdown(void) diff --git a/engine/qclib/qccmain.c b/engine/qclib/qccmain.c index 7f8cd3742..77e5e1f31 100644 --- a/engine/qclib/qccmain.c +++ b/engine/qclib/qccmain.c @@ -1943,9 +1943,6 @@ strofs = (strofs+3)&~3; verbose >= VERBOSE_DEBUGSTATEMENTS) { char line[2048]; - char *astr = statements[i].a.sym?statements[i].a.sym->name:""; - char *bstr = statements[i].b.sym?statements[i].b.sym->name:""; - char *cstr = statements[i].c.sym?statements[i].c.sym->name:""; QC_snprintfz(line, sizeof(line), "code: %s:%i: @%i %s t%i t%i %i (%s", QCC_FileForStatement(i), statements[i].linenum, i, pr_opcodes[statements[i].op].opname, a, b, c, QCC_VarAtOffset(statements[i].a)); QC_snprintfz(line+strlen(line), sizeof(line)-strlen(line), " %s", QCC_VarAtOffset(statements[i].b));