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

Fix some problems in my recent commit. 

git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@5583 fc73d0e0-1445-4013-8a0c-d673dee63da5
This commit is contained in:
Spoike 2019-11-20 05:27:43 +00:00
parent 2c07bbac7d
commit 0884f32ddb
4 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
engine/Makefile
View File

@ -1305,7 +1305,7 @@ ifeq (win,$(findstring win,$(FTE_TARGET))$(findstring _SDL,$(FTE_TARGET)))
QTV_LDFLAGS=-lws2_32 -lwinmm
SV_EXE_NAME=../$(EXE_NAME)sv$(BITS)$(EXEPOSTFIX)
SV_LDFLAGS=-lws2_32 -lwinmm
SV_LDFLAGS=-lws2_32 -lwinmm -lole32
SV_DIR=sv_mingw$(BITS)
SV_OBJS=$(COMMON_OBJS) $(SERVER_OBJS) $(PROGS_OBJS) $(WINDOWSSERVERONLY_OBJS) $(BOTLIB_OBJS) fs_win32.o $(LTO_END) resources.o $(LTO_START)
SV_CFLAGS=$(SERVER_ONLY_CFLAGS) $(W32_CFLAGS)

8
engine/client/m_download.c
View File

@ -1815,7 +1815,7 @@ static void PM_ListDownloaded(struct dl_download *dl)
}
}
#endif
#ifndef SERVERONLY
#if defined(HAVE_CLIENT) && defined(WEBCLIENT)
static void PM_UpdatePackageList(qboolean autoupdate, int retry);
static void PM_AllowPackageListQuery_Callback(void *ctx, int opt)
{
@ -1851,9 +1851,7 @@ static void PM_UpdatePackageList(qboolean autoupdate, int retry)
#else
doautoupdate |= autoupdate;
#ifdef SERVERONLY
allowphonehome = true; //erk.
#else
#ifdef HAVE_CLIENT
if (pkg_autoupdate.ival >= 1)
allowphonehome = true;
else if (allowphonehome == -1)
@ -1861,6 +1859,8 @@ static void PM_UpdatePackageList(qboolean autoupdate, int retry)
Menu_Prompt(PM_AllowPackageListQuery_Callback, NULL, "Query updates list?\n", "Okay", NULL, "Nope");
return;
}
#else
allowphonehome = true; //erk.
#endif
//kick off the initial tier of list-downloads.

2
engine/client/pr_csqc.c
View File

@ -8215,8 +8215,10 @@ qboolean CSQC_DrawView(void)
}
else
{
#ifdef USERBE
if (csqc_world.rbe)
maxtic = mintic; //physics engines need a fixed tick rate.
#endif
while(1)
{
host_frametime = cl.servertime - csqc_world.physicstime;

4
engine/common/fs.c
View File

@ -4345,6 +4345,10 @@ qboolean Sys_FindGameData(const char *poshname, const char *gamename, char *base
{
return false;
}
static qboolean Sys_SteamHasFile(char *basepath, int basepathlen, char *steamdir, char *fname) //returns the base system path
{
return false;
}
#elif defined(_WIN32) && !defined(FTE_SDL) && !defined(WINRT) && !defined(_XBOX)
#include "winquake.h"
#ifdef MINGW