From ac3e5586cd56657ff1b6f5f64af7e1d7c76b410d Mon Sep 17 00:00:00 2001 From: Tim Angus Date: Sat, 3 Oct 2009 11:58:50 +0000 Subject: * Merge ioq3-r1458 --- src/null/null_client.c | 3 ++- src/null/null_input.c | 4 +++- src/null/null_snddma.c | 3 ++- 3 files changed, 7 insertions(+), 3 deletions(-) (limited to 'src/null') diff --git a/src/null/null_client.c b/src/null/null_client.c index 8346ff93..e7340804 100644 --- a/src/null/null_client.c +++ b/src/null/null_client.c @@ -21,7 +21,8 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA =========================================================================== */ -#include "../client/client.h" +#include "../qcommon/q_shared.h" +#include "../qcommon/qcommon.h" cvar_t *cl_shownet; diff --git a/src/null/null_input.c b/src/null/null_input.c index 93841e77..ae9eab59 100644 --- a/src/null/null_input.c +++ b/src/null/null_input.c @@ -20,7 +20,6 @@ along with Tremulous; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA =========================================================================== */ -#include "../client/client.h" void IN_Init( void ) { } @@ -31,6 +30,9 @@ void IN_Frame (void) { void IN_Shutdown( void ) { } +void IN_Restart( void ) { +} + void Sys_SendKeyEvents (void) { } diff --git a/src/null/null_snddma.c b/src/null/null_snddma.c index 995203fd..27f60798 100644 --- a/src/null/null_snddma.c +++ b/src/null/null_snddma.c @@ -24,7 +24,8 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA // snddma_null.c // all other sound mixing is portable -#include "../client/client.h" +#include "../qcommon/q_shared.h" +#include "../qcommon/qcommon.h" qboolean SNDDMA_Init(void) { -- cgit