From 1dd25a4c546cf707b107ffee283b13ed6a94701b Mon Sep 17 00:00:00 2001
From: Spoike <acceptthis@users.sourceforge.net>
Date: Sun, 16 Oct 2005 03:55:52 +0000
Subject: [PATCH] Don't use Q3 UI/Cgame without opengl support.
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@1483 fc73d0e0-1445-4013-8a0c-d673dee63da5
---
engine/client/cl_cg.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/engine/client/cl_cg.c b/engine/client/cl_cg.c
index 9f9e063a7..4a454d9da 100644
--- a/engine/client/cl_cg.c
+++ b/engine/client/cl_cg.c
@@ -1011,7 +1011,6 @@ static long CG_SystemCallsEx(void *offset, unsigned int mask, int fn, const long
#ifdef _DEBUG
static long CG_SystemCallsExWrapper(void *offset, unsigned int mask, int fn, const long *arg)
{ //this is so we can use edit and continue properly (vc doesn't like function pointers for edit+continue)
- fn*=1;
return CG_SystemCallsEx(offset, mask, fn, arg);
}
#define CG_SystemCallsEx CG_SystemCallsExWrapper
@@ -1088,6 +1087,7 @@ void CG_Start (void)
if (qrenderer != QR_OPENGL)
{ //sorry.
CG_Stop();
+ Host_EndGame("Unable to connect to q3 servers without opengl.\n");
return;
}
@@ -1111,6 +1111,8 @@ void CG_Start (void)
SCR_EndLoadingPlaque();
Host_EndGame("Failed to initialise cgame module\n");
}
+#else
+ Host_EndGame("Unable to connect to q3 servers without opengl.\n");
#endif
}
@@ -1140,7 +1142,7 @@ void CG_Command_f(void)
qboolean CG_KeyPress(int key, int down)
{
- if (!cgvm)
+ if (!cgvm || !(keycatcher&8))
return false;
return VM_Call(cgvm, CG_KEY_EVENT, key, down);
}