X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fcommon%2Fmapobjects%2Ftrigger%2Fjumppads.qc;h=2c160eae95e8a05e75f1ead2512b81c257716242;hp=f438fbf01f5f8295032f45aa8e76647825377b04;hb=c726884106c898a2e1d3f33cf0bf0bb2542fe5e1;hpb=9ce1079a850c81a5f14a150f6a19cad2f51f6032 diff --git a/qcsrc/common/mapobjects/trigger/jumppads.qc b/qcsrc/common/mapobjects/trigger/jumppads.qc index f438fbf01f..2c160eae95 100644 --- a/qcsrc/common/mapobjects/trigger/jumppads.qc +++ b/qcsrc/common/mapobjects/trigger/jumppads.qc @@ -36,8 +36,8 @@ vector trigger_push_calculatevelocity(vector org, entity tgt, float ht, entity p torg = tgt.origin + (tgt.mins + tgt.maxs) * 0.5; grav = PHYS_GRAVITY(NULL); - if(pushed_entity && PHYS_ENTGRAVITY(pushed_entity)) - grav *= PHYS_ENTGRAVITY(pushed_entity); + if(pushed_entity && pushed_entity.gravity) + grav *= pushed_entity.gravity; zdist = torg.z - org.z; sdist = vlen(torg - org - zdist * '0 0 1'); @@ -135,9 +135,9 @@ bool jumppad_push(entity this, entity targ) vector org = targ.origin; #ifdef SVQC - if(autocvar_sv_vq3compat) + if(autocvar_sv_q3defragcompat) #elif defined(CSQC) - if(STAT(VQ3COMPAT)) + if(STAT(Q3DEFRAGCOMPAT)) #endif { org.z += targ.mins_z;