From c99975c73ae2941751d86d3b8466454c5ad122c0 Mon Sep 17 00:00:00 2001 From: Tim Angus Date: Wed, 5 Sep 2007 22:05:32 +0000 Subject: * Merge of ioq3-r1163 + SDL everywhere + New R_LoadImage + net_ip.c + Window icon + GUI based dedicated server support + Compile time linked OpenGL * Remove ui_menuFiles cvar --- src/null/null_client.c | 5 ++--- src/null/null_snddma.c | 1 - 2 files changed, 2 insertions(+), 4 deletions(-) (limited to 'src/null') diff --git a/src/null/null_client.c b/src/null/null_client.c index 2b98195c..8346ff93 100644 --- a/src/null/null_client.c +++ b/src/null/null_client.c @@ -54,7 +54,7 @@ void CL_MapLoading( void ) { } qboolean CL_GameCommand( void ) { - return qfalse; // bk001204 - non-void + return qfalse; } void CL_KeyEvent (int key, qboolean down, unsigned time) { @@ -82,8 +82,7 @@ void CL_CDDialog( void ) { void CL_FlushMemory( void ) { } -void CL_StartHunkUsers( void ) { +void CL_StartHunkUsers( qboolean rendererOnly ) { } -// bk001119 - added new dummy for sv_init.c void CL_ShutdownAll(void) {} diff --git a/src/null/null_snddma.c b/src/null/null_snddma.c index 559f2170..995203fd 100644 --- a/src/null/null_snddma.c +++ b/src/null/null_snddma.c @@ -48,7 +48,6 @@ void SNDDMA_Submit(void) { } -// bk001119 - added boolean flag, match client/snd_public.h sfxHandle_t S_RegisterSound( const char *name, qboolean compressed ) { return 0; -- cgit