removed detection of GL_NV_texture_shader extension which was previously used for...

[xonotic/darkplaces.git] / mvm_cmds.c

diff --git a/mvm_cmds.c b/mvm_cmds.c
index 47976cfbfe4afa6e0f923178afc3d32f430a4137..939127e331aaf9e798d581ac6391f6479672057e 100644 (file)
--- a/mvm_cmds.c
+++ b/mvm_cmds.c
@@ -282,45 +282,6 @@ void VM_M_getresolution(void)
        PRVM_G_VECTOR(OFS_RETURN)[2] = 0;
 }
 
-/*
-=========
-VM_M_keynumtostring
-
-string keynumtostring(float keynum)
-=========
-*/
-void VM_M_keynumtostring(void)
-{
-       int keynum;
-       char *tmp;
-       VM_SAFEPARMCOUNT(1, VM_M_keynumtostring);
-
-       keynum = PRVM_G_FLOAT(OFS_PARM0);
-
-       tmp = VM_GetTempString();
-
-       strcpy(tmp, Key_KeynumToString(keynum));
-
-       PRVM_G_INT(OFS_RETURN) = PRVM_SetEngineString(tmp);
-}
-
-/*
-=========
-VM_M_stringtokeynum
-
-float stringtokeynum(string key)
-=========
-*/
-void VM_M_stringtokeynum( void )
-{
-       const char *str;
-       VM_SAFEPARMCOUNT( 1, VM_M_keynumtostring );
-
-       str = PRVM_G_STRING( OFS_PARM0 );
-
-       PRVM_G_INT(OFS_RETURN) = Key_StringToKeynum( str );
-}
-
 /*
 =========
 VM_M_findkeysforcommand
@@ -668,7 +629,7 @@ refreshserverlist()
 void VM_M_refreshserverlist( void )
 {
        VM_SAFEPARMCOUNT( 0, VM_M_refreshserverlist );
-       ServerList_QueryList();
+       ServerList_QueryList(true, false);
 }
 
 /*
@@ -753,10 +714,10 @@ sizebuf_t *VM_WriteDest (void)
 
        case MSG_ONE:
                destclient = (int) PRVM_G_FLOAT(OFS_PARM2);
-               if (destclient < 0 || destclient >= svs.maxclients || !svs.clients[destclient].active)
+               if (destclient < 0 || destclient >= svs.maxclients || !svs.clients[destclient].active || !svs.clients[destclient].netconnection)
                        PRVM_ERROR("VM_clientcommand: %s: invalid client !", PRVM_NAME);
 
-               return &svs.clients[destclient].message;
+               return &svs.clients[destclient].netconnection->message;
 
        case MSG_ALL:
                return &sv.reliable_datagram;
@@ -940,7 +901,8 @@ prvm_builtin_t vm_m_builtins[] = {
        VM_cin_setstate,
        VM_cin_getstate,
        VM_cin_restart, // 465
-       0,0,0,0,0,      // 470
+       VM_drawline,    // 466
+       0,0,0,0,        // 470
        e10,                    // 480
        e10,                    // 490
        e10,                    // 500
@@ -954,12 +916,12 @@ prvm_builtin_t vm_m_builtins[] = {
        VM_M_writetofile,
        VM_M_isfunction,
        VM_M_getresolution,
-       VM_M_keynumtostring,
+       VM_keynumtostring,
        VM_M_findkeysforcommand,// 610
        VM_M_getserverliststat,
        VM_M_getserverliststring,
        VM_parseentitydata,
-       VM_M_stringtokeynum,
+       VM_stringtokeynum,
        VM_M_resetserverlistmasks,
        VM_M_setserverlistmaskstring,
        VM_M_setserverlistmasknumber,