Port cgame and game to 1.1 ABI.

12 files changed, 162 insertions, 200 deletions

diff --git a/src/cgame/cg_main.c b/src/cgame/cg_main.c
index 2761922..11ea540 100644
--- a/src/cgame/cg_main.c
+++ b/src/cgame/cg_main.c
@@ -85,9 +85,6 @@ Q_EXPORT intptr_t vmMain( int command, int arg0, int arg1, int arg2, int arg3,
       CG_EventHandling( arg0 );
       return 0;
 
-    case CG_VOIP_STRING:
-      return (intptr_t)CG_VoIPString( );
-
     default:
       CG_Error( "vmMain: unknown command %i", command );
       break;
@@ -2055,3 +2052,18 @@ static char *CG_VoIPString( void )
   return voipString;
 }
 
+// missing syscalls
+
+void trap_R_SetClipRegion( const float *region )
+{
+}
+
+void trap_Key_SetOverstrikeMode( qboolean state )
+{
+}
+
+qboolean trap_Key_GetOverstrikeMode( void )
+{
+  return qfalse;
+}
+
diff --git a/src/cgame/cg_public.h b/src/cgame/cg_public.h
index 9d197ff..75b4b48 100644
--- a/src/cgame/cg_public.h
+++ b/src/cgame/cg_public.h
@@ -120,7 +120,6 @@ typedef enum
   CG_R_ADDLIGHTTOSCENE,
   CG_R_RENDERSCENE,
   CG_R_SETCOLOR,
-  CG_R_SETCLIPREGION,
   CG_R_DRAWSTRETCHPIC,
   CG_R_MODELBOUNDS,
   CG_R_LERPTAG,
@@ -139,6 +138,11 @@ typedef enum
   CG_KEY_GETCATCHER,
   CG_KEY_SETCATCHER,
   CG_KEY_GETKEY,
+  CG_PARSE_ADD_GLOBAL_DEFINE,
+  CG_PARSE_LOAD_SOURCE,
+  CG_PARSE_FREE_SOURCE,
+  CG_PARSE_READ_TOKEN,
+  CG_PARSE_SOURCE_FILE_AND_LINE,
   CG_S_STOPBACKGROUNDTRACK,
   CG_REAL_TIME,
   CG_SNAPVECTOR,
@@ -173,17 +177,6 @@ typedef enum
   CG_KEY_GETBINDINGBUF,
   CG_KEY_SETBINDING,
 
-  CG_PARSE_ADD_GLOBAL_DEFINE,
-  CG_PARSE_LOAD_SOURCE,
-  CG_PARSE_FREE_SOURCE,
-  CG_PARSE_READ_TOKEN,
-  CG_PARSE_SOURCE_FILE_AND_LINE,
-
-  CG_KEY_SETOVERSTRIKEMODE,
-  CG_KEY_GETOVERSTRIKEMODE,
-
-  CG_S_SOUNDDURATION,
-
   CG_MEMSET = 200,
   CG_MEMCPY,
   CG_STRNCPY,
@@ -253,10 +246,6 @@ typedef enum
   // void (*CG_ConsoleText)( void );
   // pass text that has been printed to the console to cgame
   // use Cmd_Argc() / Cmd_Argv() to read it
-
-  CG_VOIP_STRING
-  // char *(*CG_VoIPString)( void );
-  // returns a string of comma-delimited clientnums based on cl_voipSendTarget
 } cgameExport_t;
 
 //----------------------------------------------
diff --git a/src/cgame/cg_syscalls.asm b/src/cgame/cg_syscalls.asm
index 2537c91..0893ebc 100644
--- a/src/cgame/cg_syscalls.asm
+++ b/src/cgame/cg_syscalls.asm
@@ -46,66 +46,60 @@ equ trap_R_AddPolyToScene             -43
 equ trap_R_AddLightToScene            -44
 equ trap_R_RenderScene                -45
 equ trap_R_SetColor                   -46
-equ trap_R_SetClipRegion              -47
-equ trap_R_DrawStretchPic             -48
-equ trap_R_ModelBounds                -49
-equ trap_R_LerpTag                    -50
-equ trap_GetGlconfig                  -51
-equ trap_GetGameState                 -52
-equ trap_GetCurrentSnapshotNumber     -53
-equ trap_GetSnapshot                  -54
-equ trap_GetServerCommand             -55
-equ trap_GetCurrentCmdNumber          -56
-equ trap_GetUserCmd                   -57
-equ trap_SetUserCmdValue              -58
-equ trap_R_RegisterShaderNoMip        -59
-equ trap_MemoryRemaining              -60
-equ trap_R_RegisterFont               -61
-equ trap_Key_IsDown                   -62
-equ trap_Key_GetCatcher               -63
-equ trap_Key_SetCatcher               -64
-equ trap_Key_GetKey                   -65
-equ trap_S_StopBackgroundTrack        -66
-equ trap_RealTime                     -67
-equ trap_SnapVector                   -68
-equ trap_RemoveCommand                -69
-equ trap_R_LightForPoint              -70
-equ trap_CIN_PlayCinematic            -71
-equ trap_CIN_StopCinematic            -72
-equ trap_CIN_RunCinematic             -73
-equ trap_CIN_DrawCinematic            -74
-equ trap_CIN_SetExtents               -75
-equ trap_R_RemapShader                -76
-equ trap_S_AddRealLoopingSound        -77
-equ trap_S_StopLoopingSound           -78
-equ trap_CM_TempCapsuleModel          -79
-equ trap_CM_CapsuleTrace              -80
-equ trap_CM_TransformedCapsuleTrace   -81
-equ trap_R_AddAdditiveLightToScene    -82
-equ trap_GetEntityToken               -83
-equ trap_R_AddPolysToScene            -84
-equ trap_R_inPVS                      -85
-equ trap_FS_Seek                      -86
-equ trap_FS_GetFileList               -87
-equ trap_LiteralArgs                  -88
-equ trap_CM_BiSphereTrace             -89
-equ trap_CM_TransformedBiSphereTrace  -90
-equ trap_GetDemoState                 -91
-equ trap_GetDemoPos                   -92
-equ trap_GetDemoName                  -93
-equ trap_Key_KeynumToStringBuf        -94
-equ trap_Key_GetBindingBuf            -95
-equ trap_Key_SetBinding               -96
-
-equ trap_Parse_AddGlobalDefine        -97
-equ trap_Parse_LoadSource             -98
-equ trap_Parse_FreeSource             -99
-equ trap_Parse_ReadToken              -100
-equ trap_Parse_SourceFileAndLine      -101
-equ trap_Key_SetOverstrikeMode        -102
-equ trap_Key_GetOverstrikeMode        -103
-
-equ trap_S_SoundDuration              -104
+equ trap_R_DrawStretchPic             -47
+equ trap_R_ModelBounds                -48
+equ trap_R_LerpTag                    -49
+equ trap_GetGlconfig                  -50
+equ trap_GetGameState                 -51
+equ trap_GetCurrentSnapshotNumber     -52
+equ trap_GetSnapshot                  -53
+equ trap_GetServerCommand             -54
+equ trap_GetCurrentCmdNumber          -55
+equ trap_GetUserCmd                   -56
+equ trap_SetUserCmdValue              -57
+equ trap_R_RegisterShaderNoMip        -58
+equ trap_MemoryRemaining              -59
+equ trap_R_RegisterFont               -60
+equ trap_Key_IsDown                   -61
+equ trap_Key_GetCatcher               -62
+equ trap_Key_SetCatcher               -63
+equ trap_Key_GetKey                   -64
+equ trap_Parse_AddGlobalDefine        -65
+equ trap_Parse_LoadSource             -66
+equ trap_Parse_FreeSource             -67
+equ trap_Parse_ReadToken              -68
+equ trap_Parse_SourceFileAndLine      -69
+equ trap_S_StopBackgroundTrack        -70
+equ trap_RealTime                     -71
+equ trap_SnapVector                   -72
+equ trap_RemoveCommand                -73
+equ trap_R_LightForPoint              -74
+equ trap_CIN_PlayCinematic            -75
+equ trap_CIN_StopCinematic            -76
+equ trap_CIN_RunCinematic             -77
+equ trap_CIN_DrawCinematic            -78
+equ trap_CIN_SetExtents               -79
+equ trap_R_RemapShader                -80
+equ trap_S_AddRealLoopingSound        -81
+equ trap_S_StopLoopingSound           -82
+equ trap_CM_TempCapsuleModel          -83
+equ trap_CM_CapsuleTrace              -84
+equ trap_CM_TransformedCapsuleTrace   -85
+equ trap_R_AddAdditiveLightToScene    -86
+equ trap_GetEntityToken               -87
+equ trap_R_AddPolysToScene            -88
+equ trap_R_inPVS                      -89
+equ trap_FS_Seek                      -90
+equ trap_FS_GetFileList               -91
+equ trap_LiteralArgs                  -92
+equ trap_CM_BiSphereTrace             -93
+equ trap_CM_TransformedBiSphereTrace  -94
+equ trap_GetDemoState                 -95
+equ trap_GetDemoPos                   -96
+equ trap_GetDemoName                  -97
+equ trap_Key_KeynumToStringBuf        -98
+equ trap_Key_GetBindingBuf            -99
+equ trap_Key_SetBinding               -100
 
 equ memset                            -201
 equ memcpy                            -202
diff --git a/src/cgame/cg_syscalls.c b/src/cgame/cg_syscalls.c
index 0c0b722..321783a 100644
--- a/src/cgame/cg_syscalls.c
+++ b/src/cgame/cg_syscalls.c
@@ -290,11 +290,6 @@ sfxHandle_t trap_S_RegisterSound( const char *sample, qboolean compressed )
   return syscall( CG_S_REGISTERSOUND, sample, compressed );
 }
 
-int trap_S_SoundDuration( sfxHandle_t handle )
-{
-  return syscall( CG_S_SOUNDDURATION, handle );
-}
-
 void  trap_S_StartBackgroundTrack( const char *intro, const char *loop )
 {
   syscall( CG_S_STARTBACKGROUNDTRACK, intro, loop );
@@ -380,11 +375,6 @@ void  trap_R_SetColor( const float *rgba )
   syscall( CG_R_SETCOLOR, rgba );
 }
 
-void  trap_R_SetClipRegion( const float *region )
-{
-  syscall( CG_R_SETCLIPREGION, region );
-}
-
 void  trap_R_DrawStretchPic( float x, float y, float w, float h,
                  float s1, float t1, float s2, float t2, qhandle_t hShader )
 {
@@ -582,11 +572,3 @@ void trap_Key_GetBindingBuf( int keynum, char *buf, int buflen ) {
 void trap_Key_SetBinding( int keynum, const char *binding ) {
   syscall( CG_KEY_SETBINDING, keynum, binding );
 }
-
-void trap_Key_SetOverstrikeMode( qboolean state ) {
-  syscall( CG_KEY_SETOVERSTRIKEMODE, state );
-}
-
-qboolean trap_Key_GetOverstrikeMode( void ) {
-  return syscall( CG_KEY_GETOVERSTRIKEMODE );
-}
diff --git a/src/game/bg_misc.c b/src/game/bg_misc.c
index b5bd305..f6721f5 100644
--- a/src/game/bg_misc.c
+++ b/src/game/bg_misc.c
@@ -5238,3 +5238,10 @@ qboolean BG_ForceFieldForEntity( playerState_t *ps, entityState_t *es, forceFiel
 
   return qfalse;
 }
+
+// missing syscalls
+
+int trap_S_SoundDuration( sfxHandle_t handle )
+{
+  return 1000;
+}
diff --git a/src/game/g_main.c b/src/game/g_main.c
index 1efc039..2923ff3 100644
--- a/src/game/g_main.c
+++ b/src/game/g_main.c
@@ -2961,3 +2961,16 @@ void G_RunFrame( int levelTime )
   level.frameMsec = trap_Milliseconds();
 }
 
+// missing syscalls
+
+void trap_SetConfigstringRestrictions( int num, const clientList_t *clientList )
+{
+}
+
+void trap_AddCommand( const char *cmdName )
+{
+}
+
+void trap_RemoveCommand( const char *cmdName )
+{
+}
diff --git a/src/game/g_public.h b/src/game/g_public.h
index 9512574..effbe37 100644
--- a/src/game/g_public.h
+++ b/src/game/g_public.h
@@ -159,8 +159,6 @@ typedef enum {
 
   G_GET_CONFIGSTRING, // ( int num, char *buffer, int bufferSize );
 
-  G_SET_CONFIGSTRING_RESTRICTIONS, // ( int num, const clientList* clientList );
-
   G_GET_USERINFO,   // ( int num, char *buffer, int bufferSize );
   // userinfo strings are maintained by the server system, so they
   // are persistant across level loads, while all other game visible
@@ -226,10 +224,7 @@ typedef enum {
   G_PARSE_READ_TOKEN,
   G_PARSE_SOURCE_FILE_AND_LINE,
 
-  G_SEND_GAMESTAT,
-
-  G_ADDCOMMAND,
-  G_REMOVECOMMAND
+  G_SEND_GAMESTAT
 } gameImport_t;
 
 
diff --git a/src/game/g_syscalls.asm b/src/game/g_syscalls.asm
index f39b138..132ca1e 100644
--- a/src/game/g_syscalls.asm
+++ b/src/game/g_syscalls.asm
@@ -1,68 +1,65 @@
 code
 
-equ trap_Print                        -1
-equ trap_Error                        -2
-equ trap_Milliseconds                 -3
-equ trap_Cvar_Register                -4
-equ trap_Cvar_Update                  -5
-equ trap_Cvar_Set                     -6
-equ trap_Cvar_VariableIntegerValue    -7
-equ trap_Cvar_VariableStringBuffer    -8
-equ trap_Argc                         -9
-equ trap_Argv                         -10
-equ trap_FS_FOpenFile                 -11
-equ trap_FS_Read                      -12
-equ trap_FS_Write                     -13
-equ trap_FS_FCloseFile                -14
-equ trap_SendConsoleCommand           -15
-equ trap_LocateGameData               -16
-equ trap_DropClient                   -17
-equ trap_SendServerCommand            -18
-equ trap_SetConfigstring              -19
-equ trap_GetConfigstring              -20
-equ trap_SetConfigstringRestrictions  -21
-equ trap_GetUserinfo                  -22
-equ trap_SetUserinfo                  -23
-equ trap_GetServerinfo                -24
-equ trap_SetBrushModel                -25
-equ trap_Trace                        -26
-equ trap_PointContents                -27
-equ trap_InPVS                        -28
-equ trap_InPVSIgnorePortals           -29
-equ trap_AdjustAreaPortalState        -30
-equ trap_AreasConnected               -31
-equ trap_LinkEntity                   -32
-equ trap_UnlinkEntity                 -33
-equ trap_EntitiesInBox                -34
-equ trap_EntityContact                -35
-equ trap_GetUsercmd                   -36
-equ trap_GetEntityToken               -37
-equ trap_FS_GetFileList               -38
-equ trap_RealTime                     -39
-equ trap_SnapVector                   -40
-equ trap_TraceCapsule                 -41
-equ trap_EntityContactCapsule         -42
-equ trap_FS_Seek                      -43
+equ trap_Print                      -1
+equ trap_Error                      -2
+equ trap_Milliseconds               -3
+equ trap_Cvar_Register              -4
+equ trap_Cvar_Update                -5
+equ trap_Cvar_Set                   -6
+equ trap_Cvar_VariableIntegerValue  -7
+equ trap_Cvar_VariableStringBuffer  -8
+equ trap_Argc                       -9
+equ trap_Argv                       -10
+equ trap_FS_FOpenFile               -11
+equ trap_FS_Read                    -12
+equ trap_FS_Write                   -13
+equ trap_FS_FCloseFile              -14
+equ trap_SendConsoleCommand         -15
+equ trap_LocateGameData             -16
+equ trap_DropClient                 -17
+equ trap_SendServerCommand          -18
+equ trap_SetConfigstring            -19
+equ trap_GetConfigstring            -20
+equ trap_GetUserinfo                -21
+equ trap_SetUserinfo                -22
+equ trap_GetServerinfo              -23
+equ trap_SetBrushModel              -24
+equ trap_Trace                      -25
+equ trap_PointContents              -26
+equ trap_InPVS                      -27
+equ trap_InPVSIgnorePortals         -28
+equ trap_AdjustAreaPortalState      -29
+equ trap_AreasConnected             -30
+equ trap_LinkEntity                 -31
+equ trap_UnlinkEntity               -32
+equ trap_EntitiesInBox              -33
+equ trap_EntityContact              -34
+equ trap_GetUsercmd                 -35
+equ trap_GetEntityToken             -36
+equ trap_FS_GetFileList             -37
+equ trap_RealTime                   -38
+equ trap_SnapVector                 -39
+equ trap_TraceCapsule               -40
+equ trap_EntityContactCapsule       -41
+equ trap_FS_Seek                    -42
 
-equ trap_Parse_AddGlobalDefine        -44
-equ trap_Parse_LoadSource             -45
-equ trap_Parse_FreeSource             -46
-equ trap_Parse_ReadToken              -47
-equ trap_Parse_SourceFileAndLine      -48
+equ trap_Parse_AddGlobalDefine      -43
+equ trap_Parse_LoadSource           -44
+equ trap_Parse_FreeSource           -45
+equ trap_Parse_ReadToken            -46
+equ trap_Parse_SourceFileAndLine    -47
 
-equ trap_SendGameStat                 -49
+equ trap_SendGameStat               -48
 
-equ trap_AddCommand                   -50
-equ trap_RemoveCommand                -51
 
-equ memset                            -101
-equ memcpy                            -102
-equ strncpy                           -103
-equ sin                               -104
-equ cos                               -105
-equ atan2                             -106
-equ sqrt                              -107
-equ floor                             -111
-equ ceil                              -112
-equ testPrintInt                      -113
-equ testPrintFloat                    -114
+equ memset                          -101
+equ memcpy                          -102
+equ strncpy                         -103
+equ sin                             -104
+equ cos                             -105
+equ atan2                           -106
+equ sqrt                            -107
+equ floor                           -111
+equ ceil                            -112
+equ testPrintInt                    -113
+equ testPrintFloat                  -114
diff --git a/src/game/g_syscalls.c b/src/game/g_syscalls.c
index 800bd2a..4ec48d3 100644
--- a/src/game/g_syscalls.c
+++ b/src/game/g_syscalls.c
@@ -151,11 +151,6 @@ void trap_GetConfigstring( int num, char *buffer, int bufferSize )
   syscall( G_GET_CONFIGSTRING, num, buffer, bufferSize );
 }
 
-void trap_SetConfigstringRestrictions( int num, const clientList_t *clientList )
-{
-  syscall( G_SET_CONFIGSTRING_RESTRICTIONS, num, clientList );
-}
-
 void trap_GetUserinfo( int num, char *buffer, int bufferSize )
 {
   syscall( G_GET_USERINFO, num, buffer, bufferSize );
@@ -290,14 +285,3 @@ int trap_Parse_SourceFileAndLine( int handle, char *filename, int *line )
 {
   return syscall( G_PARSE_SOURCE_FILE_AND_LINE, handle, filename, line );
 }
-
-void trap_AddCommand( const char *cmdName )
-{
-  syscall( G_ADDCOMMAND, cmdName );
-}
-
-void trap_RemoveCommand( const char *cmdName )
-{
-  syscall( G_REMOVECOMMAND, cmdName );
-}
-
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