From 91a23d8c9632731347a09efd5f1a08912b555461 Mon Sep 17 00:00:00 2001 From: Spoike Date: Tue, 12 Mar 2013 23:03:04 +0000 Subject: [PATCH] ------------------------------------------------------------------------ r4218 | acceptthis | 2013-02-20 09:28:20 +0000 (Wed, 20 Feb 2013) | 1 line misc improvements for the npfte port ------------------------------------------------------------------------ git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@4215 fc73d0e0-1445-4013-8a0c-d673dee63da5 --- engine/client/cl_main.c | 6 +++++- engine/client/cl_ui.c | 2 ++ engine/client/m_download.c | 3 +++ engine/client/renderer.c | 5 +++-- engine/client/sys_plugfte.c | 4 ++++ engine/client/sys_win.c | 2 +- engine/common/common.c | 1 + engine/common/net_chan.c | 2 +- engine/common/net_wins.c | 2 +- 9 files changed, 21 insertions(+), 6 deletions(-) diff --git a/engine/client/cl_main.c b/engine/client/cl_main.c index 62b6ef80e..f79daeac1 100644 --- a/engine/client/cl_main.c +++ b/engine/client/cl_main.c @@ -3971,6 +3971,7 @@ Host_Init */ void Host_Init (quakeparms_t *parms) { + qboolean downloading = false; extern cvar_t com_parseutf8; com_parseutf8.ival = 1; //enable utf8 parsing even before cvars are registered. @@ -4076,6 +4077,8 @@ void Host_Init (quakeparms_t *parms) Cmd_StuffCmds(); Cbuf_Execute (); } + else + downloading = true; Con_TPrintf (TL_NL); Con_Printf ("%s", version_string()); @@ -4094,7 +4097,8 @@ Con_TPrintf (TL_NL); Renderer_Start(); - CL_StartCinematicOrMenu(); + if (!downloading) + CL_StartCinematicOrMenu(); } /* diff --git a/engine/client/cl_ui.c b/engine/client/cl_ui.c index 1a81eb81d..84aeeb98e 100644 --- a/engine/client/cl_ui.c +++ b/engine/client/cl_ui.c @@ -1534,6 +1534,8 @@ void UI_Start (void) if (qrenderer == QR_NONE) return; + UI_Stop(); + uivm = VM_Create(NULL, "vm/ui", UI_SystemCallsNative, UI_SystemCallsVM); if (uivm) { diff --git a/engine/client/m_download.c b/engine/client/m_download.c index d90b53b53..f498ff7b7 100644 --- a/engine/client/m_download.c +++ b/engine/client/m_download.c @@ -16,6 +16,7 @@ #define DPF_DOWNLOADING 16 #define DPF_ENQUED 32 +void CL_StartCinematicOrMenu(void); int dlcount=1; @@ -956,6 +957,7 @@ static void CL_BootDownload_Complete(struct dl_download *dl) Cmd_StuffCmds(); Cbuf_Execute (); Cmd_ExecuteString("vid_restart\n", RESTRICT_LOCAL); + CL_StartCinematicOrMenu(); } } @@ -1021,6 +1023,7 @@ static void CL_Manifest_Complete(struct dl_download *dl) Cmd_StuffCmds(); Cbuf_Execute (); Cmd_ExecuteString("vid_restart\n", RESTRICT_LOCAL); + CL_StartCinematicOrMenu(); } } diff --git a/engine/client/renderer.c b/engine/client/renderer.c index d0f111886..f05d8c9ec 100644 --- a/engine/client/renderer.c +++ b/engine/client/renderer.c @@ -251,7 +251,7 @@ cvar_t gl_ati_truform = CVAR ("gl_ati_truform", "0"); cvar_t gl_ati_truform_type = CVAR ("gl_ati_truform_type", "1"); cvar_t gl_ati_truform_tesselation = CVAR ("gl_ati_truform_tesselation", "3"); cvar_t gl_blend2d = CVAR ("gl_blend2d", "1"); -cvar_t gl_blendsprites = CVAR ("gl_blendsprites", "1"); +cvar_t gl_blendsprites = CVAR ("gl_blendsprites", "0"); cvar_t r_deluxemapping = CVARAF ("r_deluxemapping", "0", "r_glsl_deluxemapping", CVAR_ARCHIVE | CVAR_RENDERERLATCH); cvar_t gl_compress = CVARF ("gl_compress", "0", @@ -1501,8 +1501,9 @@ TRACE(("dbg: R_RestartRenderer_f\n")); if (newr.renderer->rtype != QR_NONE) { int dbpp, dheight, dwidth, drate; + extern qboolean isPlugin; - if ((!newr.fullscreen && !vid_desktopsettings.value) || !Sys_GetDesktopParameters(&dwidth, &dheight, &dbpp, &drate)) + if ((!newr.fullscreen && !vid_desktopsettings.value && !isPlugin) || !Sys_GetDesktopParameters(&dwidth, &dheight, &dbpp, &drate)) { // force default values for systems not supporting desktop parameters dwidth = DEFAULT_WIDTH; diff --git a/engine/client/sys_plugfte.c b/engine/client/sys_plugfte.c index a679e4a57..68068a5fb 100644 --- a/engine/client/sys_plugfte.c +++ b/engine/client/sys_plugfte.c @@ -787,6 +787,10 @@ qboolean Plug_GetBinaryName(char *exe, int exelen, *exe = 0; *basedir = 0; + +//#ifdef _DEBUG +// Q_strncpyz(exe, "C:/Games/Quake/fte_trunk/fteglqw_dbg.exe", exelen); +//#endif /* Q_snprintfz(buffer, sizeof(buffer), "%s%s", binarypath, "npfte.txt"); diff --git a/engine/client/sys_win.c b/engine/client/sys_win.c index 64367dcd4..307989ede 100644 --- a/engine/client/sys_win.c +++ b/engine/client/sys_win.c @@ -49,7 +49,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #if !defined(CLIENTONLY) && !defined(SERVERONLY) qboolean isDedicated = false; #endif -qboolean isPlugin; +extern qboolean isPlugin; qboolean debugout; HWND sys_parentwindow; diff --git a/engine/common/common.c b/engine/common/common.c index 4b202b2f0..6e868f8f2 100644 --- a/engine/common/common.c +++ b/engine/common/common.c @@ -104,6 +104,7 @@ qboolean com_modified; // set true if using non-id files qboolean static_registered = true; // only for startup check, then set qboolean msg_suppress_1 = false; +qboolean isPlugin; void COM_Path_f (void); void COM_Dir_f (void); diff --git a/engine/common/net_chan.c b/engine/common/net_chan.c index 77bffdb81..311d7969a 100644 --- a/engine/common/net_chan.c +++ b/engine/common/net_chan.c @@ -86,7 +86,7 @@ cvar_t showdrop = SCVAR("showdrop", "0"); cvar_t qport = SCVAR("qport", "0"); cvar_t net_mtu = CVARD("net_mtu", "1450", "Specifies a maximum udp payload size, above which packets will be fragmented. If routers all worked properly this could be some massive value, and some massive value may work really nicely for lans. Use smaller values than the default if you're connecting through nested tunnels through routers that fail with IP fragmentation."); -cvar_t pext_replacementdeltas = CVAR("debug_pext_replacementdeltas", "0"); /*rename once the extension is finalized*/ +cvar_t pext_replacementdeltas = CVAR("debug_pext_replacementdeltas", "1"); /*rename once the extension is finalized*/ /*returns the entire bitmask of supported+enabled extensions*/ unsigned int Net_PextMask(int maskset, qboolean fornq) diff --git a/engine/common/net_wins.c b/engine/common/net_wins.c index 895953a58..ed1eeb5fd 100644 --- a/engine/common/net_wins.c +++ b/engine/common/net_wins.c @@ -944,7 +944,7 @@ qboolean NET_StringToAdr (const char *s, int defaultport, netadr_t *a) } #endif - if (!NET_StringToSockaddr (s, 0, &sadr, NULL, NULL)) + if (!NET_StringToSockaddr (s, defaultport, &sadr, NULL, NULL)) { a->type = NA_INVALID; return false;