* Removal of bot code

* Refactored botlib parsing code into qcommon

4 files changed, 59 insertions, 57 deletions

diff --git a/src/cgame/cg_main.c b/src/cgame/cg_main.c
index 6bd9d455..30eb134a 100644
--- a/src/cgame/cg_main.c
+++ b/src/cgame/cg_main.c
@@ -1054,7 +1054,7 @@ qboolean CG_Asset_Parse( int handle )
   pc_token_t token;
   const char *tempStr;
 
-  if( !trap_PC_ReadToken( handle, &token ) )
+  if( !trap_Parse_ReadToken( handle, &token ) )
     return qfalse;
 
   if( Q_stricmp( token.string, "{" ) != 0 )
@@ -1062,7 +1062,7 @@ qboolean CG_Asset_Parse( int handle )
 
   while( 1 )
   {
-    if( !trap_PC_ReadToken( handle, &token ) )
+    if( !trap_Parse_ReadToken( handle, &token ) )
       return qfalse;
 
     if( Q_stricmp( token.string, "}" ) == 0 )
@@ -1221,17 +1221,17 @@ void CG_ParseMenu( const char *menuFile )
   pc_token_t  token;
   int         handle;
 
-  handle = trap_PC_LoadSource( menuFile );
+  handle = trap_Parse_LoadSource( menuFile );
 
   if( !handle )
-    handle = trap_PC_LoadSource( "ui/testhud.menu" );
+    handle = trap_Parse_LoadSource( "ui/testhud.menu" );
 
   if( !handle )
     return;
 
   while( 1 )
   {
-    if( !trap_PC_ReadToken( handle, &token ) )
+    if( !trap_Parse_ReadToken( handle, &token ) )
       break;
 
     //if ( Q_stricmp( token, "{" ) ) {
@@ -1263,7 +1263,7 @@ void CG_ParseMenu( const char *menuFile )
     }
   }
 
-  trap_PC_FreeSource( handle );
+  trap_Parse_FreeSource( handle );
 }
 
 qboolean CG_Load_Menu( char **p )
diff --git a/src/cgame/cg_public.h b/src/cgame/cg_public.h
index 09f40d10..626f3201 100644
--- a/src/cgame/cg_public.h
+++ b/src/cgame/cg_public.h
@@ -138,11 +138,6 @@ typedef enum
   CG_KEY_GETCATCHER,
   CG_KEY_SETCATCHER,
   CG_KEY_GETKEY,
-  CG_PC_ADD_GLOBAL_DEFINE,
-  CG_PC_LOAD_SOURCE,
-  CG_PC_FREE_SOURCE,
-  CG_PC_READ_TOKEN,
-  CG_PC_SOURCE_FILE_AND_LINE,
   CG_S_STOPBACKGROUNDTRACK,
   CG_REAL_TIME,
   CG_SNAPVECTOR,
@@ -177,6 +172,12 @@ 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_MEMSET = 200,
   CG_MEMCPY,
   CG_STRNCPY,
diff --git a/src/cgame/cg_syscalls.asm b/src/cgame/cg_syscalls.asm
index 2fcc5296..0479f1d0 100644
--- a/src/cgame/cg_syscalls.asm
+++ b/src/cgame/cg_syscalls.asm
@@ -64,42 +64,43 @@ equ trap_Key_IsDown                   -61
 equ trap_Key_GetCatcher               -62
 equ trap_Key_SetCatcher               -63
 equ trap_Key_GetKey                   -64
-equ trap_PC_AddGlobalDefine           -65
-equ trap_PC_LoadSource                -66
-equ trap_PC_FreeSource                -67
-equ trap_PC_ReadToken                 -68
-equ trap_PC_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 trap_S_StopBackgroundTrack        -65
+equ trap_RealTime                     -66
+equ trap_SnapVector                   -67
+equ trap_RemoveCommand                -68
+equ trap_R_LightForPoint              -69
+equ trap_CIN_PlayCinematic            -70
+equ trap_CIN_StopCinematic            -71
+equ trap_CIN_RunCinematic             -72
+equ trap_CIN_DrawCinematic            -73
+equ trap_CIN_SetExtents               -74
+equ trap_R_RemapShader                -75
+equ trap_S_AddRealLoopingSound        -76
+equ trap_S_StopLoopingSound           -77
+equ trap_CM_TempCapsuleModel          -78
+equ trap_CM_CapsuleTrace              -79
+equ trap_CM_TransformedCapsuleTrace   -80
+equ trap_R_AddAdditiveLightToScene    -81
+equ trap_GetEntityToken               -82
+equ trap_R_AddPolysToScene            -83
+equ trap_R_inPVS                      -84
+equ trap_FS_Seek                      -85
+equ trap_FS_GetFileList               -86
+equ trap_LiteralArgs                  -87
+equ trap_CM_BiSphereTrace             -88
+equ trap_CM_TransformedBiSphereTrace  -89
+equ trap_GetDemoState                 -90
+equ trap_GetDemoPos                   -91
+equ trap_GetDemoName                  -92
+equ trap_Key_KeynumToStringBuf        -93
+equ trap_Key_GetBindingBuf            -94
+equ trap_Key_SetBinding               -95
+
+equ trap_Parse_AddGlobalDefine        -96
+equ trap_Parse_LoadSource             -97
+equ trap_Parse_FreeSource             -98
+equ trap_Parse_ReadToken              -99
+equ trap_Parse_SourceFileAndLine      -100
 
 equ memset                            -201
 equ memcpy                            -202
diff --git a/src/cgame/cg_syscalls.c b/src/cgame/cg_syscalls.c
index 5c7ac16d..43afc2c4 100644
--- a/src/cgame/cg_syscalls.c
+++ b/src/cgame/cg_syscalls.c
@@ -467,29 +467,29 @@ int trap_Key_GetKey( const char *binding )
   return syscall( CG_KEY_GETKEY, binding );
 }
 
-int trap_PC_AddGlobalDefine( char *define )
+int trap_Parse_AddGlobalDefine( char *define )
 {
-  return syscall( CG_PC_ADD_GLOBAL_DEFINE, define );
+  return syscall( CG_PARSE_ADD_GLOBAL_DEFINE, define );
 }
 
-int trap_PC_LoadSource( const char *filename )
+int trap_Parse_LoadSource( const char *filename )
 {
-  return syscall( CG_PC_LOAD_SOURCE, filename );
+  return syscall( CG_PARSE_LOAD_SOURCE, filename );
 }
 
-int trap_PC_FreeSource( int handle )
+int trap_Parse_FreeSource( int handle )
 {
-  return syscall( CG_PC_FREE_SOURCE, handle );
+  return syscall( CG_PARSE_FREE_SOURCE, handle );
 }
 
-int trap_PC_ReadToken( int handle, pc_token_t *pc_token )
+int trap_Parse_ReadToken( int handle, pc_token_t *pc_token )
 {
-  return syscall( CG_PC_READ_TOKEN, handle, pc_token );
+  return syscall( CG_PARSE_READ_TOKEN, handle, pc_token );
 }
 
-int trap_PC_SourceFileAndLine( int handle, char *filename, int *line )
+int trap_Parse_SourceFileAndLine( int handle, char *filename, int *line )
 {
-  return syscall( CG_PC_SOURCE_FILE_AND_LINE, handle, filename, line );
+  return syscall( CG_PARSE_SOURCE_FILE_AND_LINE, handle, filename, line );
 }
 
 void  trap_S_StopBackgroundTrack( void )