eukara/fteqw
1
0
Fork 0
forked from fte/fteqw
Code Pull requests Activity

Fix a few things.

Browse source 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@5935 fc73d0e0-1445-4013-8a0c-d673dee63da5
This commit is contained in:
Spoike 2021-07-01 11:03:28 +00:00
parent 1614b75142
commit f9b9087011
6 changed files with 15 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
engine/Makefile
View file

@ -586,17 +586,17 @@ endif
ifeq ($(FTE_TARGET),morphos)
BASELDFLAGS=-lm
endif
ifeq ($(FTE_TARGET),bsd)
ifneq (,$(findstring bsd,$(FTE_TARGET)))
BASELDFLAGS=-lm
VISIBILITY_FLAGS=-fvisibility=hidden
endif
ifeq ($(FTE_TARGET),linux)
ifneq (,$(findstring linux,$(FTE_TARGET)))
VISIBILITY_FLAGS=-fvisibility=hidden
endif
ifeq ($(FTE_TARGET),droid)
ifneq (,$(findstring droid,$(FTE_TARGET)))
VISIBILITY_FLAGS=-fvisibility=hidden
endif
ifeq ($(FTE_TARGET),macosx)
ifneq (,$(findstring macos,$(FTE_TARGET)))
VISIBILITY_FLAGS=-fvisibility=hidden
endif
BASELDFLAGS ?= -lm -ldl -lpthread

4
engine/client/cl_main.c
View file

@ -5868,8 +5868,10 @@ done:
if (f->flags & HRF_PACKAGE)
{
#ifdef PACKAGEMANAGER
Z_Free(f->packageinfo);
f->packageinfo = PM_GeneratePackageFromMeta(f->srcfile, qname,sizeof(qname), &qroot);
#endif
}
else if (f->flags & HRF_MANIFEST)
{
@ -5961,8 +5963,10 @@ done:
f->dstfile = NULL;
}
#ifdef PACKAGEMANAGER
if (f->flags & HRF_PACKAGE)
PM_FileInstalled(COM_SkipPath(f->fname), qroot, f->packageinfo, true);
#endif
Cbuf_AddText(loadcommand, RESTRICT_LOCAL);
}

3
engine/client/cl_parse.c
View file

@ -2564,8 +2564,9 @@ void DL_Abort(qdownload_t *dl, enum qdlabort aborttype)
Con_Printf("Couldn't rename %s to %s\n", nativetmp, nativefinal);
}
}
#ifdef PACKAGEMANAGER
PM_FileInstalled(dl->localname, dl->fsroot, NULL, true);
#endif
}
else
{

6
engine/client/m_download.c
View file

@ -1711,11 +1711,11 @@ static qboolean PM_FileInstalled_Internal(const char *package, const char *categ
if (pkgflags&DPF_PLUGIN)
p->arch = Z_StrDup(THISARCH);
if (!p->name)
if (!p->name || !*p->name)
p->name = Z_StrDup(package);
if (!p->title)
if (!p->title || !*p->title)
p->title = Z_StrDup(title);
if (!p->category && !*p->category)
if (!p->category || !*p->category)
p->category = Z_StrDup(category);
p->flags = pkgflags|DPF_NATIVE|DPF_FORGETONUNINSTALL;
if (enable)

1
engine/client/m_mp3.c
View file

@ -4217,6 +4217,7 @@ void Media_RecordDemo_f(void)
void Media_CaptureDemoEnd(void) {}
qboolean Media_PausedDemo(qboolean fortiming) {return false;}
int Media_Capturing (void) { return 0; }
double Media_TweekCaptureFrameTime(double oldtime, double time) { return oldtime+time ; }
void Media_RecordFrame (void) {}
void Media_VideoRestarting(void) {}

1
engine/common/pr_bgcmd.c
View file

@ -7645,6 +7645,7 @@ qc_extension_t QSG_Extensions[] = {
{"DP_SV_CLIENTCAMERA", NULL, 0,{NULL}, "Works like svc_setview except also handles pvs."},
{"DP_SV_CLIENTCOLORS", NULL, 0,{NULL}, "Provided only for compatibility with DP."},
{"DP_SV_CLIENTNAME", NULL, 0,{NULL}, "Provided only for compatibility with DP."},
{"DP_SV_CUSTOMIZEENTITYFORCLIENT", NULL, 0,{NULL}, "Deprecated feature for compat with DP. Can be slow, incompatible with splitscreen, usually malfunctions with mvds."},
{"DP_SV_DRAWONLYTOCLIENT"},
{"DP_SV_DROPCLIENT", NULL, 1,{"dropclient"}, "Equivelent to quakeworld's stuffcmd(self,\"disconnect\\n\"); hack"},
{"DP_SV_EFFECT", NULL, 1,{"effect"}},