]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
When trigger_gravity modifies the gravity of an entity, jump pads wouldn't account...
authorMircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Sun, 17 Mar 2013 15:35:33 +0000 (17:35 +0200)
committerMircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Sun, 17 Mar 2013 15:35:33 +0000 (17:35 +0200)
qcsrc/server/t_jumppads.qc

index 5a5042b3d48a63dc1a273feff50b33e767a7de8f..0b6f7fc4cd9488357ccb0b0110adf3adf87a18ec 100644 (file)
@@ -37,6 +37,8 @@ vector trigger_push_calculatevelocity(vector org, entity tgt, float ht)
        torg = tgt.origin + (tgt.mins + tgt.maxs) * 0.5;
 
        grav = autocvar_sv_gravity;
+       if(other.gravity)
+               grav *= other.gravity;
 
        zdist = torg_z - org_z;
        sdist = vlen(torg - org - zdist * '0 0 1');