From 9ed683614a6b89e0a77ba62a54bc9592d3f16958 Mon Sep 17 00:00:00 2001
From: Spoike <acceptthis@users.sourceforge.net>
Date: Wed, 28 Mar 2007 13:27:35 +0000
Subject: [PATCH] Mostly software renderer fixes.

git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@2487 fc73d0e0-1445-4013-8a0c-d673dee63da5
---
 engine/client/cl_input.c | 2 +-
 engine/client/m_mp3.c    | 3 ++-
 engine/client/sys_win.c  | 2 +-
 engine/common/plugin.c   | 4 ++--
 engine/gl/gl_bloom.c     | 2 ++
 engine/sw/vid_win2.c     | 6 ++++++
 6 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/engine/client/cl_input.c b/engine/client/cl_input.c
index b59f50268..55fa5cfa4 100644
--- a/engine/client/cl_input.c
+++ b/engine/client/cl_input.c
@@ -209,7 +209,7 @@ void IN_JumpDown (void)
 	
 
 
-	condition = (cls.state == ca_active && cl_smartjump.value);
+	condition = (cls.state == ca_active && cl_smartjump.value && !prox_inmenu.value);
 #ifdef Q2CLIENT
 	if (condition && cls.protocol == CP_QUAKE2)
 		KeyDown(&in_up);
diff --git a/engine/client/m_mp3.c b/engine/client/m_mp3.c
index f45ccaaaf..f5798e8fa 100644
--- a/engine/client/m_mp3.c
+++ b/engine/client/m_mp3.c
@@ -2000,13 +2000,14 @@ void Media_Init(void)
 	Cvar_Register(&capturesound,	"AVI capture controls");
 	Cvar_Register(&capturerate,	"AVI capture controls");
 	Cvar_Register(&capturecodec,	"AVI capture controls");
-#endif
 
 #if defined(WINAVI)
 	Cvar_Register(&capturesoundbits,	"AVI capture controls");
 	Cvar_Register(&capturesoundchannels,	"AVI capture controls");
 #endif
 
+#endif
+
 #ifdef WINAMP
 	Cvar_Register(&media_hijackwinamp,	"Media player things");
 #endif
diff --git a/engine/client/sys_win.c b/engine/client/sys_win.c
index 4dea3b5d7..70d818b5f 100644
--- a/engine/client/sys_win.c
+++ b/engine/client/sys_win.c
@@ -1039,7 +1039,7 @@ int WINAPI WinMain (HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLin
 	quakeparms_t	parms;
 	double			time, oldtime, newtime;
 	MEMORYSTATUS	lpBuffer;
-	static	char	cwd[1024];
+	char	cwd[1024];
 	int				t;
 	RECT			rect;
 	char *qtvfile = NULL;
diff --git a/engine/common/plugin.c b/engine/common/plugin.c
index 9d9c149a1..3df1bb6aa 100644
--- a/engine/common/plugin.c
+++ b/engine/common/plugin.c
@@ -338,8 +338,8 @@ int Plug_Emumerated (char *name, int size, void *param)
 
 int VARGS Plug_Con_Print(void *offset, unsigned int mask, const long *arg)
 {
-	if (qrenderer <= 0)
-		return false;
+//	if (qrenderer <= 0)
+//		return false;
 	Con_Printf("%s", (char*)VM_POINTER(arg[0]));
 	return 0;
 }
diff --git a/engine/gl/gl_bloom.c b/engine/gl/gl_bloom.c
index 96a998250..97fb522fa 100644
--- a/engine/gl/gl_bloom.c
+++ b/engine/gl/gl_bloom.c
@@ -23,6 +23,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 //http://www.quakesrc.org/forums/viewtopic.php?t=4340&start=0
 
 #include "quakedef.h"
+#ifdef RGLQUAKE
 #include "glquake.h"
 
 extern vrect_t         scr_vrect;
@@ -630,3 +631,4 @@ void R_BloomBlend (void)//refdef_t *fd, meshlist_t *meshlist )
 		Con_Printf("GL Error whilst rendering bloom\n");
 }
 
+#endif
diff --git a/engine/sw/vid_win2.c b/engine/sw/vid_win2.c
index 2b5efcabe..d0ba37ae3 100644
--- a/engine/sw/vid_win2.c
+++ b/engine/sw/vid_win2.c
@@ -985,6 +985,12 @@ void	SWVID_Update (vrect_t *rects)	//end frame...
 	}
 }
 
+void SWVID_SetCaption(char *text)
+{
+	SetWindowText(mainwindow, text);
+}
+
+
 void SWVID_HandlePause (qboolean pause)	//release mouse
 {
 #ifdef MGL