From d37536edf4660f3c46e4876b6d72e9a200549ffe Mon Sep 17 00:00:00 2001 From: tma Date: Wed, 5 Sep 2007 18:17:46 +0000 Subject: * Merge unified-sdl to trunk * Bump Q3_VERSION to 1.35 git-svn-id: svn://svn.icculus.org/quake3/trunk@1161 edf5b092-35ff-0310-97b2-ce42778d08ea --- code/null/null_client.c | 6 ++---- code/null/null_snddma.c | 1 - 2 files changed, 2 insertions(+), 5 deletions(-) (limited to 'code/null') diff --git a/code/null/null_client.c b/code/null/null_client.c index a41063b..e70b3b8 100644 --- a/code/null/null_client.c +++ b/code/null/null_client.c @@ -53,7 +53,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) { @@ -81,11 +81,9 @@ 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) {} -// bk001208 - added new dummy (RC4) qboolean CL_CDKeyValidate( const char *key, const char *checksum ) { return qtrue; } diff --git a/code/null/null_snddma.c b/code/null/null_snddma.c index 97f99e2..1918201 100644 --- a/code/null/null_snddma.c +++ b/code/null/null_snddma.c @@ -47,7 +47,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 v1.2.3