team-fte
/
fteqw
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@5068 fc73d0e0-1445-4013-8a0c-d673dee63da5

This commit is contained in:
Spoike 2017-03-04 19:42:12 +00:00
parent 9aed521689
commit 4bfdc546de
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
engine/client/m_download.c
View File

@ -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)

3
engine/qclib/qccmain.c
View File

@ -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));