cl_movement: move crouch handling so that sv_maxairspeed*0.5 is maximum crouching...

[xonotic/darkplaces.git] / prvm_cmds.c

diff --git a/prvm_cmds.c b/prvm_cmds.c
index bba2a724fd5c3a0a3686ec166999f897711e9a62..267cee53a39360e6f42c2d7b883aea978862767f 100644 (file)
--- a/prvm_cmds.c
+++ b/prvm_cmds.c
@@ -2117,7 +2117,7 @@ void VM_substring(void)
        start = bound(0, start, slength);
 
        if (length < 0) // FTE_STRINGS feature
-               length += slength - start;
+               length += slength - start + 1;
        maxlen = min((int)sizeof(string) - 1, slength - start);
        length = bound(0, length, maxlen);
 
@@ -2610,6 +2610,7 @@ float     gettime(void)
 =========
 */
 extern double host_starttime;
+float CDAudio_GetPosition(void);
 void VM_gettime(void)
 {
        int timer_index;
@@ -2635,7 +2636,10 @@ void VM_gettime(void)
                 PRVM_G_FLOAT(OFS_RETURN) = (float) (Sys_DoubleTime() - realtime);
                 break;
             case 3: // GETTIME_UPTIME
-                PRVM_G_FLOAT(OFS_RETURN) = (float) Sys_DoubleTime() - host_starttime;
+                PRVM_G_FLOAT(OFS_RETURN) = (float) (Sys_DoubleTime() - host_starttime);
+                break;
+            case 4: // GETTIME_CDTRACK
+                PRVM_G_FLOAT(OFS_RETURN) = (float) CDAudio_GetPosition();
                 break;
                        default:
                                VM_Warning("VM_gettime: %s: unsupported timer specified, returning realtime\n", PRVM_NAME);
@@ -5232,3 +5236,19 @@ void VM_netaddress_resolve (void)
        else
                PRVM_G_INT(OFS_RETURN) = PRVM_SetTempString("");
 }
+
+//string(void) getextresponse = #624; // returns the next extResponse packet that was sent to this client
+void VM_getextresponse (void)
+{
+       VM_SAFEPARMCOUNT(0,VM_argv);
+
+       if (net_extresponse_count <= 0)
+               PRVM_G_INT(OFS_RETURN) = OFS_NULL;
+       else
+       {
+               int first;
+               --net_extresponse_count;
+               first = (net_extresponse_last + NET_EXTRESPONSE_MAX - net_extresponse_count) % NET_EXTRESPONSE_MAX;
+               PRVM_G_INT(OFS_RETURN) = PRVM_SetEngineString(net_extresponse[first]);
+       }
+}