diff options
Diffstat (limited to 'src/client')
| -rw-r--r-- | src/client/cl_cgame.c | 25 | ||||
| -rw-r--r-- | src/client/cl_ui.c | 24 |
2 files changed, 20 insertions, 29 deletions
diff --git a/src/client/cl_cgame.c b/src/client/cl_cgame.c index 7d4c0a95..fd7c29ed 100644 --- a/src/client/cl_cgame.c +++ b/src/client/cl_cgame.c @@ -25,10 +25,6 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #include "client.h" -#include "../botlib/botlib.h" - -extern botlib_export_t *botlib_export; - extern qboolean loadCamera(const char *name); extern void startCamera(int time); extern qboolean getCameraInfo(int time, vec3_t *origin, vec3_t *angles); @@ -646,6 +642,16 @@ intptr_t CL_CgameSystemCalls( intptr_t *args ) { Key_SetBinding( args[1], VMA(2) ); return 0; + case CG_PARSE_ADD_GLOBAL_DEFINE: + return Parse_AddGlobalDefine( VMA(1) ); + case CG_PARSE_LOAD_SOURCE: + return Parse_LoadSourceHandle( VMA(1) ); + case CG_PARSE_FREE_SOURCE: + return Parse_FreeSourceHandle( args[1] ); + case CG_PARSE_READ_TOKEN: + return Parse_ReadTokenHandle( args[1], VMA(2) ); + case CG_PARSE_SOURCE_FILE_AND_LINE: + return Parse_SourceFileAndLine( args[1], VMA(2), VMA(3) ); case CG_MEMSET: Com_Memset( VMA(1), args[2], args[3] ); @@ -671,17 +677,6 @@ intptr_t CL_CgameSystemCalls( intptr_t *args ) { case CG_ACOS: return FloatAsInt( Q_acos( VMF(1) ) ); - case CG_PC_ADD_GLOBAL_DEFINE: - return botlib_export->PC_AddGlobalDefine( VMA(1) ); - case CG_PC_LOAD_SOURCE: - return botlib_export->PC_LoadSourceHandle( VMA(1) ); - case CG_PC_FREE_SOURCE: - return botlib_export->PC_FreeSourceHandle( args[1] ); - case CG_PC_READ_TOKEN: - return botlib_export->PC_ReadTokenHandle( args[1], VMA(2) ); - case CG_PC_SOURCE_FILE_AND_LINE: - return botlib_export->PC_SourceFileAndLine( args[1], VMA(2), VMA(3) ); - case CG_S_STOPBACKGROUNDTRACK: S_StopBackgroundTrack(); return 0; diff --git a/src/client/cl_ui.c b/src/client/cl_ui.c index d5dca4c2..327eaacf 100644 --- a/src/client/cl_ui.c +++ b/src/client/cl_ui.c @@ -23,10 +23,6 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #include "client.h" -#include "../botlib/botlib.h" - -extern botlib_export_t *botlib_export; - vm_t *uivm; /* @@ -958,16 +954,16 @@ intptr_t CL_UISystemCalls( intptr_t *args ) { case UI_CEIL: return FloatAsInt( ceil( VMF(1) ) ); - case UI_PC_ADD_GLOBAL_DEFINE: - return botlib_export->PC_AddGlobalDefine( VMA(1) ); - case UI_PC_LOAD_SOURCE: - return botlib_export->PC_LoadSourceHandle( VMA(1) ); - case UI_PC_FREE_SOURCE: - return botlib_export->PC_FreeSourceHandle( args[1] ); - case UI_PC_READ_TOKEN: - return botlib_export->PC_ReadTokenHandle( args[1], VMA(2) ); - case UI_PC_SOURCE_FILE_AND_LINE: - return botlib_export->PC_SourceFileAndLine( args[1], VMA(2), VMA(3) ); + case UI_PARSE_ADD_GLOBAL_DEFINE: + return Parse_AddGlobalDefine( VMA(1) ); + case UI_PARSE_LOAD_SOURCE: + return Parse_LoadSourceHandle( VMA(1) ); + case UI_PARSE_FREE_SOURCE: + return Parse_FreeSourceHandle( args[1] ); + case UI_PARSE_READ_TOKEN: + return Parse_ReadTokenHandle( args[1], VMA(2) ); + case UI_PARSE_SOURCE_FILE_AND_LINE: + return Parse_SourceFileAndLine( args[1], VMA(2), VMA(3) ); case UI_S_STOPBACKGROUNDTRACK: S_StopBackgroundTrack(); |