From 459c3dcb5dfc5908c3782830cdf9a5bff97deda8 Mon Sep 17 00:00:00 2001 From: Spoike Date: Tue, 21 Feb 2017 23:44:11 +0000 Subject: [PATCH] more compile fixes git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@5062 fc73d0e0-1445-4013-8a0c-d673dee63da5 --- engine/client/cd_null.c | 1 - engine/client/vid_headless.c | 2 +- engine/web/fs_web.c | 4 ++-- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/engine/client/cd_null.c b/engine/client/cd_null.c index 0c48915e..9486a171 100644 --- a/engine/client/cd_null.c +++ b/engine/client/cd_null.c @@ -1,7 +1,6 @@ #include "quakedef.h" #ifdef HAVE_CDPLAYER - //nothing #ifdef _WIN32 //not really needed, but nice none-the-less. diff --git a/engine/client/vid_headless.c b/engine/client/vid_headless.c index 33b72e91..b9d27581 100644 --- a/engine/client/vid_headless.c +++ b/engine/client/vid_headless.c @@ -38,7 +38,7 @@ static void Headless_R_DeInit (void) static void Headless_R_RenderView (void) { } -#ifdef _WIN32 +#if defined(_WIN32) && !defined(FTE_SDL) //tray icon crap, so the user can still restore the game. LRESULT CALLBACK HeadlessWndProc(HWND wnd, UINT msg, WPARAM wparam, LPARAM lparam) { diff --git a/engine/web/fs_web.c b/engine/web/fs_web.c index f16ce125..eeb62f8e 100644 --- a/engine/web/fs_web.c +++ b/engine/web/fs_web.c @@ -155,7 +155,7 @@ vfsfile_t *VFSOS_Open(const char *osname, const char *mode) qboolean needsflush; f = VFSWEB_Open(osname, mode, &needsflush); if (needsflush) - FS_FlushFSHash(); + FS_FlushFSHashFull(); return f; } @@ -233,7 +233,7 @@ static qboolean QDECL FSWEB_FLocate(searchpathfuncs_t *handle, flocation_t *loc, { loc->len = len; loc->offset = 0; - loc->index = 0; + loc->fhandle = NULL; Q_strncpyz(loc->rawname, netpath, sizeof(loc->rawname)); } return true;