------------------------------------------------------------------------

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

@@ -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,6 +4097,7 @@ Con_TPrintf (TL_NL);
 
 	Renderer_Start();
 
+	if (!downloading)
 		CL_StartCinematicOrMenu();
 }
 

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

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();
 	}
 }
 

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;

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

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;

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

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)

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;