cl_main: Disconnect only if we're connected or playing a demo. Fixes Steel Storm...

[xonotic/darkplaces.git] / svvm_cmds.c

diff --git a/svvm_cmds.c b/svvm_cmds.c
index 4d46fd9dba8885f223d6147ebcfb34eb172d2905..634de8147fe65a72a8a18bd2e5a10a97ab6a4c7b 100644 (file)
--- a/svvm_cmds.c
+++ b/svvm_cmds.c
@@ -228,6 +228,7 @@ const char *vm_sv_extensions[] = {
 "TW_SV_STEPCONTROL",
 "ZQ_PAUSE",
 "DP_RM_CLIPGROUP",
+"DP_QC_FS_SEARCH_PACKFILE",
 NULL
 //"EXT_CSQC" // not ready yet
 };
@@ -265,7 +266,7 @@ static void VM_SV_setorigin(prvm_prog_t *prog)
 }
 
 // TODO: rotate param isnt used.. could be a bug. please check this and remove it if possible [1/10/2008 Black]
-static void SetMinMaxSize (prvm_prog_t *prog, prvm_edict_t *e, float *min, float *max, qboolean rotate)
+static void SetMinMaxSize (prvm_prog_t *prog, prvm_edict_t *e, float *min, float *max, qbool rotate)
 {
        int             i;
 
@@ -519,6 +520,7 @@ already running on that entity/channel pair.
 An attenuation of 0 will play full volume everywhere in the level.
 Larger attenuations will drop off.
 
+void(entity e, float chan, string samp, float volume[, float atten[, float pitchchange[, float flags]]]) sound (QUAKE)
 =================
 */
 static void VM_SV_sound(prvm_prog_t *prog)
@@ -1078,7 +1080,7 @@ static void VM_SV_walkmove(prvm_prog_t *prog)
        vec3_t  move;
        mfunction_t     *oldf;
        int     oldself;
-       qboolean        settrace;
+       qbool   settrace;
 
        VM_SAFEPARMCOUNTRANGE(2, 3, VM_SV_walkmove);
 
@@ -2437,7 +2439,7 @@ static int SV_GetExtendedTagInfo (prvm_prog_t *prog, prvm_edict_t *e, int tagind
        return 1;
 }
 
-void SV_GetEntityMatrix (prvm_prog_t *prog, prvm_edict_t *ent, matrix4x4_t *out, qboolean viewmatrix)
+void SV_GetEntityMatrix (prvm_prog_t *prog, prvm_edict_t *ent, matrix4x4_t *out, qbool viewmatrix)
 {
        float scale;
        float pitchsign = 1;
@@ -3205,7 +3207,7 @@ VM_SV_setsize,                                    // #4 void(entity e, vector min, vector max) setsize (QUAKE)
 NULL,                                                  // #5 void(entity e, vector min, vector max) setabssize (QUAKE)
 VM_break,                                              // #6 void() break (QUAKE)
 VM_random,                                             // #7 float() random (QUAKE)
-VM_SV_sound,                                   // #8 void(entity e, float chan, string samp) sound (QUAKE)
+VM_SV_sound,                                   // #8 void(entity e, float chan, string samp, float volume[, float atten[, float pitchchange[, float flags]]]) sound (QUAKE)
 VM_normalize,                                  // #9 vector(vector v) normalize (QUAKE)
 VM_error,                                              // #10 void(string e) error (QUAKE)
 VM_objerror,                                   // #11 void(string e) objerror (QUAKE)