From b86cbd75d8ff0e1606c041b5ed77c340cb802715 Mon Sep 17 00:00:00 2001 From: Paweł Redman Date: Sun, 29 Nov 2015 19:58:18 +0100 Subject: Port cgame and game to 1.1 ABI. --- src/ui/ui_main.c | 8 +++++++- src/ui/ui_shared.c | 16 ---------------- src/ui/ui_shared.h | 3 +-- 3 files changed, 8 insertions(+), 19 deletions(-) (limited to 'src/ui') diff --git a/src/ui/ui_main.c b/src/ui/ui_main.c index 27406b1..0278cca 100644 --- a/src/ui/ui_main.c +++ b/src/ui/ui_main.c @@ -4668,7 +4668,13 @@ void UI_UpdateNews( qboolean begin ) uiInfo.newsInfo.refreshActive = qfalse; } +// missing syscalls + void trap_R_SetClipRegion( const float *region ) { - // syscall missing in 1.1 +} + +qboolean trap_GetNews( qboolean force ) +{ + return qfalse; } diff --git a/src/ui/ui_shared.c b/src/ui/ui_shared.c index 3b566a7..7a47413 100644 --- a/src/ui/ui_shared.c +++ b/src/ui/ui_shared.c @@ -8079,19 +8079,3 @@ static qboolean Menu_OverActiveItem( menuDef_t *menu, float x, float y ) return qfalse; } - - -/* -NOTE: conflicts with the not yet ported cgame - -void trap_R_SetClipRegion( const float *region ) -{ - // syscall missing in 1.1 -} -*/ - -qboolean trap_GetNews( qboolean force ) -{ - // syscall missing in 1.1 - return qfalse; -} diff --git a/src/ui/ui_shared.h b/src/ui/ui_shared.h index 649d51f..6441ce5 100644 --- a/src/ui/ui_shared.h +++ b/src/ui/ui_shared.h @@ -529,8 +529,6 @@ void Controls_GetConfig( void ); void Controls_SetConfig( qboolean restart ); void Controls_SetDefaults( void ); -void trap_R_SetClipRegion( const float *region ); - //for cg_draw.c void Item_Text_Wrapped_Paint( itemDef_t *item ); const char *Item_Text_Wrap( const char *text, float scale, float width ); @@ -556,4 +554,5 @@ int trap_Parse_SourceFileAndLine( int handle, char *filename, int *line ); void BindingFromName( const char *cvar ); extern char g_nameBind1[ 32 ]; extern char g_nameBind2[ 32 ]; + #endif -- cgit